diff --git a/src/include/86box/resource.h b/src/include/86box/resource.h
index 86215fdfc..0cd8d1423 100644
--- a/src/include/86box/resource.h
+++ b/src/include/86box/resource.h
@@ -180,23 +180,21 @@
 #define IDC_CHECK_PARALLEL3	1079
 
 #define IDC_OTHER_PERIPH	1080	/* storage controllers config */
-#define IDC_COMBO_SCSI		1081
-#define IDC_CONFIGURE_SCSI	1082
-#define IDC_COMBO_HDC		1083
-#define IDC_CONFIGURE_HDC	1084
-#define IDC_CHECK_IDE_TER	1085
-#define IDC_BUTTON_IDE_TER	1086
-#define IDC_CHECK_IDE_QUA	1087
-#define IDC_BUTTON_IDE_QUA	1088
-#define IDC_GROUP_SCSI		1089
-#define IDC_COMBO_SCSI_1	1090
-#define IDC_COMBO_SCSI_2	1091
-#define IDC_COMBO_SCSI_3	1092
-#define IDC_COMBO_SCSI_4	1093
-#define IDC_CONFIGURE_SCSI_1	1094
-#define IDC_CONFIGURE_SCSI_2	1095
-#define IDC_CONFIGURE_SCSI_3	1096
-#define IDC_CONFIGURE_SCSI_4	1097
+#define IDC_COMBO_HDC		1081
+#define IDC_CONFIGURE_HDC	1082
+#define IDC_CHECK_IDE_TER	1083
+#define IDC_BUTTON_IDE_TER	1084
+#define IDC_CHECK_IDE_QUA	1085
+#define IDC_BUTTON_IDE_QUA	1086
+#define IDC_GROUP_SCSI		1087
+#define IDC_COMBO_SCSI_1	1088
+#define IDC_COMBO_SCSI_2	1089
+#define IDC_COMBO_SCSI_3	1090
+#define IDC_COMBO_SCSI_4	1091
+#define IDC_CONFIGURE_SCSI_1	1092
+#define IDC_CONFIGURE_SCSI_2	1093
+#define IDC_CONFIGURE_SCSI_3	1094
+#define IDC_CONFIGURE_SCSI_4	1095
 
 #define IDC_HARD_DISKS		1100	/* hard disks config */
 #define IDC_LIST_HARD_DISKS	1101
diff --git a/src/win/86Box.rc b/src/win/86Box.rc
index 4b059c533..658b7868b 100644
--- a/src/win/86Box.rc
+++ b/src/win/86Box.rc
@@ -588,11 +588,6 @@ BEGIN
     COMBOBOX        IDC_COMBO_SCSI_4,73,157,137,120,
                     CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
     PUSHBUTTON      "Configure",IDC_CONFIGURE_SCSI_4,213,157,38,12
-
-    LTEXT           "SCSI Controller:",IDT_1717,7,185,64,10
-    COMBOBOX        IDC_COMBO_SCSI,64,183,155,120,CBS_DROPDOWNLIST | 
-                    WS_VSCROLL | WS_TABSTOP
-    PUSHBUTTON      "Configure",IDC_CONFIGURE_SCSI,222,183,38,12
 END
 
 DLG_CFG_HARD_DISKS DIALOG DISCARDABLE  107, 0, 267, 154
diff --git a/src/win/win_settings.c b/src/win/win_settings.c
index 90e2a00d4..f0a00c6c5 100644
--- a/src/win/win_settings.c
+++ b/src/win/win_settings.c
@@ -1615,7 +1615,8 @@ win_settings_storage_proc(HWND hdlg, UINT message, WPARAM wParam, LPARAM lParam)
 
 		/*SCSI config*/
 		c = d = 0;
-		settings_reset_content(hdlg, IDC_COMBO_SCSI);
+		for (e = 0; e < SCSI_BUS_MAX; e++)
+			settings_reset_content(hdlg, IDC_COMBO_SCSI_1 + e);
 		while (1) {
 			generate_device_name(scsi_card_getdevice(c), scsi_card_get_internal_name(c), 1);