diff --git a/src/modules/partition/gui/EditExistingPartitionDialog.cpp b/src/modules/partition/gui/EditExistingPartitionDialog.cpp
index e52627fec..51b5a33d7 100644
--- a/src/modules/partition/gui/EditExistingPartitionDialog.cpp
+++ b/src/modules/partition/gui/EditExistingPartitionDialog.cpp
@@ -56,13 +56,12 @@ EditExistingPartitionDialog::EditExistingPartitionDialog( Device* device, Partit
     , m_usedMountPoints( usedMountPoints )
 {
     m_ui->setupUi( this );
-    standardMountPoints( *(m_ui->mountPointComboBox) );
+    standardMountPoints( *(m_ui->mountPointComboBox), PartitionInfo::mountPoint( partition ) );
 
     QColor color = ColorUtils::colorForPartition( m_partition );
     m_partitionSizeController->init( m_device, m_partition, color );
     m_partitionSizeController->setSpinBox( m_ui->sizeSpinBox );
 
-    m_ui->mountPointComboBox->setCurrentText( PartitionInfo::mountPoint( partition ) );
     connect( m_ui->mountPointComboBox, &QComboBox::currentTextChanged,
              this, &EditExistingPartitionDialog::checkMountPointSelection );
 
diff --git a/src/modules/partition/gui/MountPoints.cpp b/src/modules/partition/gui/MountPoints.cpp
index 03de34207..6d8dc6e04 100644
--- a/src/modules/partition/gui/MountPoints.cpp
+++ b/src/modules/partition/gui/MountPoints.cpp
@@ -46,3 +46,12 @@ standardMountPoints(QComboBox& combo)
     combo.addItems( standardMountPoints() );
 }
 
+void
+standardMountPoints(QComboBox& combo, const QString& selected)
+{
+    standardMountPoints( combo );
+    if ( selected.isEmpty() )
+        combo.setCurrentIndex( 0 );
+    else
+        combo.setCurrentText( selected );
+}
diff --git a/src/modules/partition/gui/MountPoints.h b/src/modules/partition/gui/MountPoints.h
index d9edd9db4..c91f24e6d 100644
--- a/src/modules/partition/gui/MountPoints.h
+++ b/src/modules/partition/gui/MountPoints.h
@@ -38,4 +38,10 @@ QStringList standardMountPoints();
  */
 void standardMountPoints( QComboBox& );
 
+/**
+ * As above, but also sets the displayed mount point to @p selected,
+ * unless it is empty, in which case "(no mount point)" is chosen.
+ */
+void standardMountPoints( QComboBox&, const QString& selected );
+
 #endif