diff --git a/src/modules/partition/CreatePartitionDialog.cpp b/src/modules/partition/CreatePartitionDialog.cpp
index 592aa2b6f..4990faea0 100644
--- a/src/modules/partition/CreatePartitionDialog.cpp
+++ b/src/modules/partition/CreatePartitionDialog.cpp
@@ -27,6 +27,9 @@
 #include <fs/filesystem.h>
 #include <fs/filesystemfactory.h>
 
+// Qt
+#include <QComboBox>
+
 CreatePartitionDialog::CreatePartitionDialog( Device* device, Partition* freePartition, QWidget* parent )
     : QDialog( parent )
     , m_ui( new Ui_CreatePartitionDialog )
@@ -104,7 +107,7 @@ CreatePartitionDialog::createJob()
         fs, first, last,
         QString() /* path */,
         PartitionTable::FlagNone /* availableFlags */,
-        QString() /* mountPoint */,
+        m_ui->mountPointComboBox->currentText(),
         false /* mounted */,
         PartitionTable::FlagNone /* activeFlags */,
         Partition::StateNew
diff --git a/src/modules/partition/CreatePartitionDialog.ui b/src/modules/partition/CreatePartitionDialog.ui
index 1fb210ea3..1e2380e4a 100644
--- a/src/modules/partition/CreatePartitionDialog.ui
+++ b/src/modules/partition/CreatePartitionDialog.ui
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>263</width>
-    <height>179</height>
+    <width>425</width>
+    <height>321</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -39,7 +39,7 @@
        </property>
       </widget>
      </item>
-     <item row="4" column="0">
+     <item row="5" column="0">
       <spacer name="verticalSpacer">
        <property name="orientation">
         <enum>Qt::Vertical</enum>
@@ -86,6 +86,56 @@
        </property>
       </widget>
      </item>
+     <item row="4" column="0">
+      <widget class="QLabel" name="label_3">
+       <property name="text">
+        <string>&amp;Mount Point:</string>
+       </property>
+       <property name="buddy">
+        <cstring>mountPointComboBox</cstring>
+       </property>
+      </widget>
+     </item>
+     <item row="4" column="1">
+      <widget class="QComboBox" name="mountPointComboBox">
+       <property name="editable">
+        <bool>true</bool>
+       </property>
+       <property name="currentIndex">
+        <number>-1</number>
+       </property>
+       <item>
+        <property name="text">
+         <string>/</string>
+        </property>
+       </item>
+       <item>
+        <property name="text">
+         <string>/boot</string>
+        </property>
+       </item>
+       <item>
+        <property name="text">
+         <string>/home</string>
+        </property>
+       </item>
+       <item>
+        <property name="text">
+         <string>/opt</string>
+        </property>
+       </item>
+       <item>
+        <property name="text">
+         <string>/usr</string>
+        </property>
+       </item>
+       <item>
+        <property name="text">
+         <string>/var</string>
+        </property>
+       </item>
+      </widget>
+     </item>
     </layout>
    </item>
    <item>