diff --git a/src/modules/partition/gui/CreatePartitionDialog.cpp b/src/modules/partition/gui/CreatePartitionDialog.cpp
index 788aa0355..90545fe80 100644
--- a/src/modules/partition/gui/CreatePartitionDialog.cpp
+++ b/src/modules/partition/gui/CreatePartitionDialog.cpp
@@ -110,6 +110,8 @@ CreatePartitionDialog::CreatePartitionDialog( Device* device, PartitionNode* par
     updateMountPointUi();
 
     setupFlagsList();
+    // Checks the initial selection.
+    checkMountPointSelection();
 }
 
 CreatePartitionDialog::~CreatePartitionDialog()
@@ -257,10 +259,12 @@ CreatePartitionDialog::updateMountPointUi()
 }
 
 void
-CreatePartitionDialog::checkMountPointSelection(const QString& selection)
+CreatePartitionDialog::checkMountPointSelection()
 {
+    const QString& selection = m_ui->mountPointComboBox->currentText();
+
     if (m_usedMountPoints.contains(selection)) {
-        m_ui->labelMountPoint->setText("Mountpoint already used. Please select another one.");
+        m_ui->labelMountPoint->setText("Mountpoint already in use. Please select another one.");
         m_ui->buttonBox->button(QDialogButtonBox::Ok)->setEnabled(false);
     } else {
         m_ui->labelMountPoint->setText( QString() );
diff --git a/src/modules/partition/gui/CreatePartitionDialog.h b/src/modules/partition/gui/CreatePartitionDialog.h
index 7773d5f8b..641616e3f 100644
--- a/src/modules/partition/gui/CreatePartitionDialog.h
+++ b/src/modules/partition/gui/CreatePartitionDialog.h
@@ -61,7 +61,7 @@ public:
 
 private Q_SLOTS:
     void updateMountPointUi();
-    void checkMountPointSelection(const QString &);
+    void checkMountPointSelection();
 
 private:
     void setupFlagsList();