diff --git a/src/qt/qt_settingsstoragecontrollers.cpp b/src/qt/qt_settingsstoragecontrollers.cpp
index 2af7bd080..b3d827fa2 100644
--- a/src/qt/qt_settingsstoragecontrollers.cpp
+++ b/src/qt/qt_settingsstoragecontrollers.cpp
@@ -56,8 +56,8 @@ SettingsStorageControllers::save()
         QComboBox *cbox      = findChild<QComboBox *>(QString("comboBoxSCSI%1").arg(i + 1));
         scsi_card_current[i] = cbox->currentData().toInt();
     }
-    hdc_current[0]          = ui->comboBoxHD->currentData().toInt();
     fdc_current[0]          = ui->comboBoxFD->currentData().toInt();
+    hdc_current[0]          = ui->comboBoxHD->currentData().toInt();
     cdrom_interface_current = ui->comboBoxCDInterface->currentData().toInt();
     ide_ter_enabled         = ui->checkBoxTertiaryIDE->isChecked() ? 1 : 0;
     ide_qua_enabled         = ui->checkBoxQuaternaryIDE->isChecked() ? 1 : 0;
@@ -237,15 +237,6 @@ SettingsStorageControllers::onCurrentMachineChanged(int machineId)
     ui->pushButtonConfigureLbaEnhancer->setEnabled(ui->checkBoxLbaEnhancer->isChecked());
 }
 
-void
-SettingsStorageControllers::on_comboBoxHD_currentIndexChanged(int index)
-{
-    if (index < 0)
-        return;
-
-    ui->pushButtonHD->setEnabled(hdc_has_config(ui->comboBoxHD->currentData().toInt()) > 0);
-}
-
 void
 SettingsStorageControllers::on_comboBoxFD_currentIndexChanged(int index)
 {
@@ -255,6 +246,15 @@ SettingsStorageControllers::on_comboBoxFD_currentIndexChanged(int index)
     ui->pushButtonFD->setEnabled(hdc_has_config(ui->comboBoxFD->currentData().toInt()) > 0);
 }
 
+void
+SettingsStorageControllers::on_comboBoxHD_currentIndexChanged(int index)
+{
+    if (index < 0)
+        return;
+
+    ui->pushButtonHD->setEnabled(hdc_has_config(ui->comboBoxHD->currentData().toInt()) > 0);
+}
+
 void
 SettingsStorageControllers::on_comboBoxCDInterface_currentIndexChanged(int index)
 {
@@ -276,18 +276,18 @@ SettingsStorageControllers::on_checkBoxQuaternaryIDE_stateChanged(int arg1)
     ui->pushButtonQuaternaryIDE->setEnabled(arg1 == Qt::Checked);
 }
 
-void
-SettingsStorageControllers::on_pushButtonHD_clicked()
-{
-    DeviceConfig::ConfigureDevice(hdc_get_device(ui->comboBoxHD->currentData().toInt()));
-}
-
 void
 SettingsStorageControllers::on_pushButtonFD_clicked()
 {
     DeviceConfig::ConfigureDevice(fdc_card_getdevice(ui->comboBoxFD->currentData().toInt()));
 }
 
+void
+SettingsStorageControllers::on_pushButtonHD_clicked()
+{
+    DeviceConfig::ConfigureDevice(hdc_get_device(ui->comboBoxHD->currentData().toInt()));
+}
+
 void
 SettingsStorageControllers::on_pushButtonCDInterface_clicked()
 {
diff --git a/src/qt/qt_settingsstoragecontrollers.hpp b/src/qt/qt_settingsstoragecontrollers.hpp
index 6774bb504..7c1c56086 100644
--- a/src/qt/qt_settingsstoragecontrollers.hpp
+++ b/src/qt/qt_settingsstoragecontrollers.hpp
@@ -20,12 +20,12 @@ public slots:
     void onCurrentMachineChanged(int machineId);
 
 private slots:
-    void on_comboBoxHD_currentIndexChanged(int index);
-    void on_pushButtonHD_clicked();
-
     void on_comboBoxFD_currentIndexChanged(int index);
     void on_pushButtonFD_clicked();
 
+    void on_comboBoxHD_currentIndexChanged(int index);
+    void on_pushButtonHD_clicked();
+
     void on_comboBoxCDInterface_currentIndexChanged(int index);
     void on_pushButtonCDInterface_clicked();
 
diff --git a/src/qt/qt_settingsstoragecontrollers.ui b/src/qt/qt_settingsstoragecontrollers.ui
index 04a87c1d5..cd1bf9baf 100644
--- a/src/qt/qt_settingsstoragecontrollers.ui
+++ b/src/qt/qt_settingsstoragecontrollers.ui
@@ -29,13 +29,34 @@
    <item>
     <layout class="QGridLayout" name="gridLayout">
      <item row="0" column="0">
+      <widget class="QLabel" name="labelFD">
+       <property name="text">
+        <string>FD Controller:</string>
+       </property>
+      </widget>
+     </item>
+     <item row="0" column="1">
+      <widget class="QComboBox" name="comboBoxFD">
+       <property name="maxVisibleItems">
+        <number>30</number>
+       </property>
+      </widget>
+     </item>
+     <item row="0" column="2">
+      <widget class="QPushButton" name="pushButtonFD">
+       <property name="text">
+        <string>Configure</string>
+       </property>
+      </widget>
+     </item>
+     <item row="1" column="0">
       <widget class="QLabel" name="labelHD">
        <property name="text">
         <string>HD Controller:</string>
        </property>
       </widget>
      </item>
-     <item row="0" column="1">
+     <item row="1" column="1">
       <widget class="QComboBox" name="comboBoxHD">
        <property name="sizePolicy">
         <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
@@ -48,29 +69,8 @@
        </property>
       </widget>
      </item>
-     <item row="0" column="2">
-      <widget class="QPushButton" name="pushButtonHD">
-       <property name="text">
-        <string>Configure</string>
-       </property>
-      </widget>
-     </item>
-     <item row="1" column="0">
-      <widget class="QLabel" name="labelFD">
-       <property name="text">
-        <string>FD Controller:</string>
-       </property>
-      </widget>
-     </item>
-     <item row="1" column="1">
-      <widget class="QComboBox" name="comboBoxFD">
-       <property name="maxVisibleItems">
-        <number>30</number>
-       </property>
-      </widget>
-     </item>
      <item row="1" column="2">
-      <widget class="QPushButton" name="pushButtonFD">
+      <widget class="QPushButton" name="pushButtonHD">
        <property name="text">
         <string>Configure</string>
        </property>