diff --git a/src/include/86box/language.h b/src/include/86box/language.h
index 180b39b37..9d8634bb4 100644
--- a/src/include/86box/language.h
+++ b/src/include/86box/language.h
@@ -117,6 +117,7 @@
 #define IDS_2141	2141		// "Save"
 #define IDS_2142	2142		// "Don't save"
 #define IDS_2143	2143		// "This will hard reset the virtual..."
+#define IDS_2144	2144		// "%hs Device Configuration"
 
 #define IDS_4096	4096		// "Hard disk (%s)"
 #define IDS_4097	4097		// "%01i:%01i"
@@ -224,7 +225,7 @@
 
 #define IDS_LANG_ENUS	IDS_7168
 
-#define STR_NUM_2048	96
+#define STR_NUM_2048	97
 #define STR_NUM_3072	11
 #define STR_NUM_4096	39
 #define STR_NUM_4352	6
diff --git a/src/win/86Box.rc b/src/win/86Box.rc
index 007d12b07..9e5982464 100644
--- a/src/win/86Box.rc
+++ b/src/win/86Box.rc
@@ -1041,6 +1041,7 @@ BEGIN
     IDS_2141	"Save"
     IDS_2142	"Don't save"
     IDS_2143	"This will hard reset the virtual machine."
+    IDS_2144	"%hs Device Configuration"
 END
 
 STRINGTABLE DISCARDABLE 
diff --git a/src/win/win_devconf.c b/src/win/win_devconf.c
index 18b567d79..1ae0eddc2 100644
--- a/src/win/win_devconf.c
+++ b/src/win/win_devconf.c
@@ -454,7 +454,8 @@ deviceconfig_inst_open(HWND hwnd, const device_t *device, int inst)
 
     *data++ = 0; /*no menu*/
     *data++ = 0; /*predefined dialog box class*/
-    data += MultiByteToWideChar(CP_ACP, 0, "Device Configuration", -1, data, 120);
+
+    data += wsprintf(data, plat_get_string(IDS_2144), device->name) + 1;
 
     *data++ = 9; /*Point*/
     data += MultiByteToWideChar(CP_ACP, 0, "Segoe UI", -1, data, 120);
@@ -499,7 +500,7 @@ deviceconfig_inst_open(HWND hwnd, const device_t *device, int inst)
 			item->cx = 140;
 			item->cy = 150;
 
-			item->style = WS_CHILD | WS_VISIBLE | CBS_DROPDOWN | WS_VSCROLL;
+			item->style = WS_CHILD | WS_VISIBLE | CBS_DROPDOWNLIST | WS_VSCROLL;
 
 			data = (uint16_t *)(item + 1);
 			*data++ = 0xFFFF;
@@ -514,7 +515,7 @@ deviceconfig_inst_open(HWND hwnd, const device_t *device, int inst)
 			/*Static text*/
 			item = (DLGITEMTEMPLATE *)data;
 			item->x = 10;
-			item->y = y;
+			item->y = y + 2;
 			item->id = id++;
 
 			item->cx = 60;
@@ -561,7 +562,7 @@ deviceconfig_inst_open(HWND hwnd, const device_t *device, int inst)
 			/*Static text*/
 			item = (DLGITEMTEMPLATE *)data;
 			item->x = 10;
-			item->y = y;
+			item->y = y + 2;
 			item->id = id++;
 
 			item->cx = 60;
@@ -628,7 +629,7 @@ deviceconfig_inst_open(HWND hwnd, const device_t *device, int inst)
 			/*Static text*/
 			item = (DLGITEMTEMPLATE *)data;
 			item->x = 10;
-			item->y = y;
+			item->y = y + 2;
 			item->id = id++;
 
 			item->cx = 60;
@@ -659,8 +660,8 @@ deviceconfig_inst_open(HWND hwnd, const device_t *device, int inst)
     dlg->cdit = (id - IDC_CONFIG_BASE) + 2;
 
     item = (DLGITEMTEMPLATE *)data;
-    item->x = 20;
-    item->y = y;
+    item->x = 100;
+    item->y = y + 5;
     item->cx = 50;
     item->cy = 14;
     item->id = IDOK;  /* OK button identifier */
@@ -677,8 +678,8 @@ deviceconfig_inst_open(HWND hwnd, const device_t *device, int inst)
 	data++;
 
     item = (DLGITEMTEMPLATE *)data;
-    item->x = 80;
-    item->y = y;
+    item->x = 160;
+    item->y = y + 5;
     item->cx = 50;
     item->cy = 14;
     item->id = IDCANCEL;  /* OK button identifier */
@@ -691,7 +692,7 @@ deviceconfig_inst_open(HWND hwnd, const device_t *device, int inst)
     data += MultiByteToWideChar(CP_ACP, 0, "Cancel", -1, data, 50);
     *data++ = 0;              /* no creation data */
 
-    dlg->cy = y + 20;
+    dlg->cy = y + 25;
 
     device_set_context(&config_device, device, inst);