diff --git a/src/qt/qt_settings_bus_tracking.cpp b/src/qt/qt_settings_bus_tracking.cpp
index f6a1c184e..c367b6389 100644
--- a/src/qt/qt_settings_bus_tracking.cpp
+++ b/src/qt/qt_settings_bus_tracking.cpp
@@ -74,7 +74,7 @@ SettingsBusTracking::next_free_ide_channel()
         element = ((i << 3) >> 6);
         mask = 0xffULL << ((uint64_t) ((i << 3) & 0x3f));
 
-        if (ide_tracking[element] & mask) {
+        if (!(ide_tracking[element] & mask)) {
 		ret = (uint8_t) i;
                 break;
         }
@@ -95,7 +95,7 @@ SettingsBusTracking::next_free_scsi_id()
         element = ((i << 3) >> 6);
         mask = 0xffULL << ((uint64_t) ((i << 3) & 0x3f));
 
-        if (scsi_tracking[element] & mask) {
+        if (!(scsi_tracking[element] & mask)) {
 		ret = (uint8_t) i;
                 break;
         }
diff --git a/src/qt/qt_settings_bus_tracking.hpp b/src/qt/qt_settings_bus_tracking.hpp
index 614e18d8d..0272b4359 100644
--- a/src/qt/qt_settings_bus_tracking.hpp
+++ b/src/qt/qt_settings_bus_tracking.hpp
@@ -49,15 +49,15 @@ public:
 
 private:
     /* 1 channel, 2 devices per channel, 8 bits per device = 16 bits. */
-    uint64_t mfm_tracking;
+    uint64_t mfm_tracking{0};
     /* 1 channel, 2 devices per channel, 8 bits per device = 16 bits. */
-    uint64_t esdi_tracking;
+    uint64_t esdi_tracking{0};
     /* 1 channel, 2 devices per channel, 8 bits per device = 16 bits. */
-    uint64_t xta_tracking;
+    uint64_t xta_tracking{0};
     /* 16 channels (prepatation for that weird IDE card), 2 devices per channel, 8 bits per device = 256 bits. */
-    uint64_t ide_tracking[4];
+    uint64_t ide_tracking[4]{0, 0, 0, 0};
     /* 4 buses, 16 devices per bus, 8 bits per device (future-proofing) = 512 bits. */
-    uint64_t scsi_tracking[8];
+    uint64_t scsi_tracking[8]{0, 0, 0, 0, 0, 0, 0, 0};
 };
 
 #endif // QT_SETTINGS_BUS_TRACKING_HPP
diff --git a/src/qt/qt_settingsfloppycdrom.cpp b/src/qt/qt_settingsfloppycdrom.cpp
index e61156d0e..6253cb739 100644
--- a/src/qt/qt_settingsfloppycdrom.cpp
+++ b/src/qt/qt_settingsfloppycdrom.cpp
@@ -11,6 +11,7 @@ extern "C" {
 
 #include "qt_models_common.hpp"
 #include "qt_harddrive_common.hpp"
+#include "qt_settings_bus_tracking.hpp"
 #include "qt_progsettings.hpp"
 
 static void setFloppyType(QAbstractItemModel* model, const QModelIndex& idx, int type) {
@@ -109,6 +110,7 @@ SettingsFloppyCDROM::SettingsFloppyCDROM(QWidget *parent) :
         auto idx = model->index(i, 0);
         setCDROMBus(model, idx, cdrom[i].bus_type, cdrom[i].res);
         setCDROMSpeed(model, idx.siblingAtColumn(1), cdrom[i].speed);
+        Harddrives::busTrackClass->device_track(1, DEV_CDROM, cdrom[i].bus_type, cdrom[i].bus_type == CDROM_BUS_ATAPI ? cdrom[i].ide_channel : cdrom[i].scsi_device_id);
     }
     ui->tableViewCDROM->resizeColumnsToContents();
     ui->tableViewCDROM->horizontalHeader()->setSectionResizeMode(0, QHeaderView::Stretch);
@@ -208,19 +210,26 @@ void SettingsFloppyCDROM::on_comboBoxSpeed_activated(int index) {
 
 
 void SettingsFloppyCDROM::on_comboBoxBus_activated(int) {
+    auto i = ui->tableViewCDROM->selectionModel()->currentIndex().siblingAtColumn(0);
+    Harddrives::busTrackClass->device_track(0, DEV_CDROM, ui->tableViewCDROM->model()->data(i, Qt::UserRole).toInt(), ui->tableViewCDROM->model()->data(i, Qt::UserRole + 1).toInt());
+    ui->comboBoxChannel->setCurrentIndex(ui->comboBoxBus->currentData().toUInt() == CDROM_BUS_ATAPI ? Harddrives::busTrackClass->next_free_ide_channel() : Harddrives::busTrackClass->next_free_scsi_id());
     setCDROMBus(
         ui->tableViewCDROM->model(),
         ui->tableViewCDROM->selectionModel()->currentIndex(),
         ui->comboBoxBus->currentData().toUInt(),
         ui->comboBoxChannel->currentData().toUInt());
+    Harddrives::busTrackClass->device_track(1, DEV_CDROM, ui->tableViewCDROM->model()->data(i, Qt::UserRole).toInt(), ui->tableViewCDROM->model()->data(i, Qt::UserRole + 1).toInt());
 }
 
 
 void SettingsFloppyCDROM::on_comboBoxChannel_activated(int) {
+    auto i = ui->tableViewCDROM->selectionModel()->currentIndex().siblingAtColumn(0);
+    Harddrives::busTrackClass->device_track(0, DEV_CDROM, ui->tableViewCDROM->model()->data(i, Qt::UserRole).toInt(), ui->tableViewCDROM->model()->data(i, Qt::UserRole + 1).toInt());
     setCDROMBus(
         ui->tableViewCDROM->model(),
         ui->tableViewCDROM->selectionModel()->currentIndex(),
         ui->comboBoxBus->currentData().toUInt(),
         ui->comboBoxChannel->currentData().toUInt());
+    Harddrives::busTrackClass->device_track(1, DEV_CDROM, ui->tableViewCDROM->model()->data(i, Qt::UserRole).toInt(), ui->tableViewCDROM->model()->data(i, Qt::UserRole + 1).toInt());
 }
 
diff --git a/src/qt/qt_settingsotherremovable.cpp b/src/qt/qt_settingsotherremovable.cpp
index 3fa7b0351..c6f089f80 100644
--- a/src/qt/qt_settingsotherremovable.cpp
+++ b/src/qt/qt_settingsotherremovable.cpp
@@ -12,6 +12,7 @@ extern "C" {
 
 #include "qt_models_common.hpp"
 #include "qt_harddrive_common.hpp"
+#include "qt_settings_bus_tracking.hpp"
 #include "qt_progsettings.hpp"
 
 static QString moDriveTypeName(int i) {
@@ -93,6 +94,7 @@ SettingsOtherRemovable::SettingsOtherRemovable(QWidget *parent) :
         auto idx = model->index(i, 0);
         setMOBus(model, idx, mo_drives[i].bus_type, mo_drives[i].res);
         setMOType(model, idx.siblingAtColumn(1), mo_drives[i].type);
+        Harddrives::busTrackClass->device_track(1, DEV_MO, mo_drives[i].bus_type, mo_drives[i].bus_type == MO_BUS_ATAPI ? mo_drives[i].ide_channel : mo_drives[i].scsi_device_id);
     }
     ui->tableViewMO->resizeColumnsToContents();
     ui->tableViewMO->horizontalHeader()->setSectionResizeMode(0, QHeaderView::Stretch);
@@ -114,6 +116,7 @@ SettingsOtherRemovable::SettingsOtherRemovable(QWidget *parent) :
         auto idx = model->index(i, 0);
         setZIPBus(model, idx, zip_drives[i].bus_type, zip_drives[i].res);
         setZIPType(model, idx, zip_drives[i].is_250 > 0);
+        Harddrives::busTrackClass->device_track(1, DEV_ZIP, zip_drives[i].bus_type, zip_drives[i].bus_type == ZIP_BUS_ATAPI ? zip_drives[i].ide_channel : zip_drives[i].scsi_device_id);
     }
     ui->tableViewZIP->resizeColumnsToContents();
     ui->tableViewZIP->horizontalHeader()->setSectionResizeMode(0, QHeaderView::Stretch);
@@ -200,6 +203,10 @@ void SettingsOtherRemovable::on_comboBoxMOBus_currentIndexChanged(int index) {
 }
 
 void SettingsOtherRemovable::on_comboBoxMOBus_activated(int) {
+    auto i = ui->tableViewMO->selectionModel()->currentIndex().siblingAtColumn(0);
+    Harddrives::busTrackClass->device_track(0, DEV_MO, ui->tableViewMO->model()->data(i, Qt::UserRole).toInt(), ui->tableViewMO->model()->data(i, Qt::UserRole + 1).toInt());
+    ui->comboBoxMOChannel->setCurrentIndex(ui->comboBoxMOBus->currentData().toUInt() == MO_BUS_ATAPI ? Harddrives::busTrackClass->next_free_ide_channel() : Harddrives::busTrackClass->next_free_scsi_id());
+    ui->tableViewMO->model()->data(i, Qt::UserRole + 1);
     setMOBus(
         ui->tableViewMO->model(),
         ui->tableViewMO->selectionModel()->currentIndex(),
@@ -211,14 +218,18 @@ void SettingsOtherRemovable::on_comboBoxMOBus_activated(int) {
         ui->comboBoxMOType->currentData().toUInt());
     ui->tableViewMO->resizeColumnsToContents();
     ui->tableViewMO->horizontalHeader()->setSectionResizeMode(0, QHeaderView::Stretch);
+    Harddrives::busTrackClass->device_track(1, DEV_MO, ui->tableViewMO->model()->data(i, Qt::UserRole).toInt(), ui->tableViewMO->model()->data(i, Qt::UserRole + 1).toInt());
 }
 
 void SettingsOtherRemovable::on_comboBoxMOChannel_activated(int) {
+    auto i = ui->tableViewMO->selectionModel()->currentIndex().siblingAtColumn(0);
+    Harddrives::busTrackClass->device_track(0, DEV_MO, ui->tableViewMO->model()->data(i, Qt::UserRole).toInt(), ui->tableViewMO->model()->data(i, Qt::UserRole + 1).toInt());
     setMOBus(
         ui->tableViewMO->model(),
         ui->tableViewMO->selectionModel()->currentIndex(),
         ui->comboBoxMOBus->currentData().toUInt(),
         ui->comboBoxMOChannel->currentData().toUInt());
+    Harddrives::busTrackClass->device_track(1, DEV_MO, ui->tableViewMO->model()->data(i, Qt::UserRole).toInt(), ui->tableViewMO->model()->data(i, Qt::UserRole + 1).toInt());
 }
 
 void SettingsOtherRemovable::on_comboBoxMOType_activated(int) {
@@ -243,19 +254,26 @@ void SettingsOtherRemovable::on_comboBoxZIPBus_currentIndexChanged(int index) {
 }
 
 void SettingsOtherRemovable::on_comboBoxZIPBus_activated(int) {
+    auto i = ui->tableViewZIP->selectionModel()->currentIndex().siblingAtColumn(0);
+    Harddrives::busTrackClass->device_track(0, DEV_ZIP, ui->tableViewZIP->model()->data(i, Qt::UserRole).toInt(), ui->tableViewZIP->model()->data(i, Qt::UserRole + 1).toInt());
+    ui->comboBoxZIPChannel->setCurrentIndex(ui->comboBoxZIPBus->currentData().toUInt() == ZIP_BUS_ATAPI ? Harddrives::busTrackClass->next_free_ide_channel() : Harddrives::busTrackClass->next_free_scsi_id());
     setZIPBus(
         ui->tableViewZIP->model(),
         ui->tableViewZIP->selectionModel()->currentIndex(),
         ui->comboBoxZIPBus->currentData().toUInt(),
         ui->comboBoxZIPChannel->currentData().toUInt());
+    Harddrives::busTrackClass->device_track(1, DEV_ZIP, ui->tableViewZIP->model()->data(i, Qt::UserRole).toInt(), ui->tableViewZIP->model()->data(i, Qt::UserRole + 1).toInt());
 }
 
 void SettingsOtherRemovable::on_comboBoxZIPChannel_activated(int) {
+    auto i = ui->tableViewZIP->selectionModel()->currentIndex().siblingAtColumn(0);
+    Harddrives::busTrackClass->device_track(0, DEV_ZIP, ui->tableViewZIP->model()->data(i, Qt::UserRole).toInt(), ui->tableViewZIP->model()->data(i, Qt::UserRole + 1).toInt());
     setZIPBus(
         ui->tableViewZIP->model(),
         ui->tableViewZIP->selectionModel()->currentIndex(),
         ui->comboBoxZIPBus->currentData().toUInt(),
         ui->comboBoxZIPChannel->currentData().toUInt());
+    Harddrives::busTrackClass->device_track(1, DEV_ZIP, ui->tableViewZIP->model()->data(i, Qt::UserRole).toInt(), ui->tableViewZIP->model()->data(i, Qt::UserRole + 1).toInt());
 }
 
 void SettingsOtherRemovable::on_checkBoxZIP250_stateChanged(int state) {