diff --git a/src/sound/snd_cms.c b/src/sound/snd_cms.c
index 631e00c6a..15a065776 100644
--- a/src/sound/snd_cms.c
+++ b/src/sound/snd_cms.c
@@ -207,7 +207,7 @@ static const device_config_t cms_config[] =
 const device_t cms_device =
 {
         "Creative Music System / Game Blaster",
-        0, 0,
+        DEVICE_ISA, 0,
         cms_init, cms_close, NULL,
         { NULL }, NULL, NULL,
         cms_config
diff --git a/src/sound/snd_gus.c b/src/sound/snd_gus.c
index fe94ebf2f..003b93b58 100644
--- a/src/sound/snd_gus.c
+++ b/src/sound/snd_gus.c
@@ -1315,7 +1315,7 @@ static const device_config_t gus_config[] = {
 const device_t gus_device =
 {
         "Gravis UltraSound",
-        DEVICE_ISA,
+        DEVICE_ISA | DEVICE_AT,
 	0,
         gus_init, gus_close, NULL,
 	{ NULL },
diff --git a/src/sound/snd_ssi2001.c b/src/sound/snd_ssi2001.c
index 55740fac9..400700131 100644
--- a/src/sound/snd_ssi2001.c
+++ b/src/sound/snd_ssi2001.c
@@ -118,7 +118,7 @@ static const device_config_t ssi2001_config[] =
 const device_t ssi2001_device =
 {
         "Innovation SSI-2001",
-        0, 0,
+        DEVICE_ISA, 0,
         ssi2001_init, ssi2001_close, NULL,
 	{ NULL }, NULL, NULL,
         ssi2001_config
diff --git a/src/win/win_settings.c b/src/win/win_settings.c
index 4b538f31b..668487d00 100644
--- a/src/win/win_settings.c
+++ b/src/win/win_settings.c
@@ -1380,12 +1380,15 @@ win_settings_sound_proc(HWND hdlg, UINT message, WPARAM wParam, LPARAM lParam)
 		settings_set_check(hdlg, IDC_CHECK_MPU401, temp_mpu401);
 		settings_enable_window(hdlg, IDC_CHECK_MPU401, mpu401_standalone_allow());
 		settings_enable_window(hdlg, IDC_CONFIGURE_MPU401, mpu401_standalone_allow() && temp_mpu401);
+		settings_enable_window(hdlg, IDC_CHECK_CMS, (machines[temp_machine].flags & MACHINE_BUS_ISA));
 		settings_set_check(hdlg, IDC_CHECK_CMS, temp_GAMEBLASTER);
-		settings_enable_window(hdlg, IDC_CONFIGURE_CMS, temp_GAMEBLASTER);
+		settings_enable_window(hdlg, IDC_CONFIGURE_CMS, (machines[temp_machine].flags & MACHINE_BUS_ISA) && temp_GAMEBLASTER);		
+		settings_enable_window(hdlg, IDC_CHECK_GUS, (machines[temp_machine].flags & MACHINE_BUS_ISA16));
 		settings_set_check(hdlg, IDC_CHECK_GUS, temp_GUS);
-		settings_enable_window(hdlg, IDC_CONFIGURE_GUS, temp_GUS);
+		settings_enable_window(hdlg, IDC_CONFIGURE_GUS, (machines[temp_machine].flags & MACHINE_BUS_ISA16) && temp_GUS);	
+		settings_enable_window(hdlg, IDC_CHECK_SSI, (machines[temp_machine].flags & MACHINE_BUS_ISA));
 		settings_set_check(hdlg, IDC_CHECK_SSI, temp_SSI2001);
-		settings_enable_window(hdlg, IDC_CONFIGURE_SSI, temp_SSI2001);
+		settings_enable_window(hdlg, IDC_CONFIGURE_SSI, (machines[temp_machine].flags & MACHINE_BUS_ISA) && temp_SSI2001);
 		settings_set_check(hdlg, IDC_CHECK_FLOAT, temp_float);
 
 		free(lptsTemp);