diff --git a/src/qt/qt_settingsotherperipherals.cpp b/src/qt/qt_settingsotherperipherals.cpp
index beb484848..f662b644c 100644
--- a/src/qt/qt_settingsotherperipherals.cpp
+++ b/src/qt/qt_settingsotherperipherals.cpp
@@ -47,6 +47,7 @@ SettingsOtherPeripherals::onCurrentMachineChanged(int machineId)
     ui->checkBoxPOSTCard->setChecked(postcard_enabled > 0 ? true : false);
     ui->checkBoxUnitTester->setChecked(unittester_enabled > 0 ? true : false);
     ui->checkBoxISABugger->setEnabled(machineHasIsa);
+    ui->pushButtonConfigureUT->setEnabled(unittester_enabled > 0);
     ui->comboBoxRTC->setEnabled(machineHasIsa);
     ui->pushButtonConfigureRTC->setEnabled(machineHasIsa);
 
@@ -201,6 +202,12 @@ SettingsOtherPeripherals::on_pushButtonConfigureCard4_clicked()
     DeviceConfig::ConfigureDevice(isamem_get_device(ui->comboBoxCard4->currentData().toInt()), 4, qobject_cast<Settings *>(Settings::settings));
 }
 
+void
+SettingsOtherPeripherals::on_checkBoxUnitTester_stateChanged(int arg1)
+{
+    ui->pushButtonConfigureUT->setEnabled(arg1 != 0);
+}
+
 void
 SettingsOtherPeripherals::on_pushButtonConfigureUT_clicked()
 {
diff --git a/src/qt/qt_settingsotherperipherals.hpp b/src/qt/qt_settingsotherperipherals.hpp
index b521e7829..feaa7a001 100644
--- a/src/qt/qt_settingsotherperipherals.hpp
+++ b/src/qt/qt_settingsotherperipherals.hpp
@@ -30,6 +30,7 @@ private slots:
     void on_comboBoxCard1_currentIndexChanged(int index);
     void on_pushButtonConfigureRTC_clicked();
     void on_comboBoxRTC_currentIndexChanged(int index);
+    void on_checkBoxUnitTester_stateChanged(int arg1);
     void on_pushButtonConfigureUT_clicked();
 
 private: