diff --git a/win/win32/mhdlg.c b/win/win32/mhdlg.c
index 07022570d..354a532d9 100644
--- a/win/win32/mhdlg.c
+++ b/win/win32/mhdlg.c
@@ -328,8 +328,8 @@ BOOL CALLBACK PlayerSelectorDlgProc(HWND hWnd, UINT message, WPARAM wParam, LPAR
 		/* init dialog */
 		plselInitDialog(hWnd);
 
-		/* set focus on the name field */
-		SetFocus(GetDlgItem(hWnd, IDC_PLSEL_NAME));
+		/* set focus on the role checkbox (random) field */
+		SetFocus(GetDlgItem(hWnd, IDC_PLSEL_ROLE_RANDOM));
 
 		/* tell windows we set the focus */
 		return FALSE;
diff --git a/win/win32/winhack.rc b/win/win32/winhack.rc
index 7a752d149..b842434b1 100644
--- a/win/win32/winhack.rc
+++ b/win/win32/winhack.rc
@@ -145,45 +145,46 @@ BEGIN
     EDITTEXT        IDC_GETLIN_EDIT,0,0,130,13,ES_AUTOHSCROLL
 END
 
-IDD_EXTCMD DIALOG DISCARDABLE  0, 0, 129, 114
+IDD_EXTCMD DIALOG DISCARDABLE  0, 0, 137, 117
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Extended Commands"
 FONT 8, "MS Sans Serif"
 BEGIN
-    DEFPUSHBUTTON   "OK",IDOK,75,5,50,14
-    PUSHBUTTON      "Cancel",IDCANCEL,75,20,50,14
-    LISTBOX         IDC_EXTCMD_LIST,5,5,65,105,LBS_NOINTEGRALHEIGHT | 
+    DEFPUSHBUTTON   "OK",IDOK,80,7,50,14
+    PUSHBUTTON      "Cancel",IDCANCEL,80,24,50,14
+    LISTBOX         IDC_EXTCMD_LIST,7,7,65,103,LBS_NOINTEGRALHEIGHT | 
                     WS_VSCROLL | WS_TABSTOP
 END
 
-IDD_PLAYER_SELECTOR DIALOG DISCARDABLE  0, 0, 144, 164
+IDD_PLAYER_SELECTOR DIALOG DISCARDABLE  0, 0, 152, 169
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "What are you?"
 FONT 8, "MS Sans Serif"
 BEGIN
-    DEFPUSHBUTTON   "Play",IDOK,5,145,65,14
-    PUSHBUTTON      "Quit",IDCANCEL,75,145,65,14
-    EDITTEXT        IDC_PLSEL_NAME,35,5,105,12,ES_AUTOHSCROLL | ES_READONLY
-    LTEXT           "Name:",IDC_STATIC,5,5,25,10
-    GROUPBOX        "Role",IDC_STATIC,5,20,135,30
-    GROUPBOX        "Race",IDC_STATIC,5,50,135,30
-    GROUPBOX        "Gender",IDC_STATIC,5,85,135,30
-    GROUPBOX        "Alignment",IDC_STATIC,5,115,135,30
+    DEFPUSHBUTTON   "Play",IDOK,7,148,66,14
+    PUSHBUTTON      "Quit",IDCANCEL,79,148,66,14
+    LTEXT           "Name:",IDC_STATIC,7,8,25,10
+    EDITTEXT        IDC_PLSEL_NAME,40,7,105,12,ES_AUTOHSCROLL | ES_READONLY | 
+                    NOT WS_TABSTOP
+    GROUPBOX        "Role",IDC_STATIC,7,21,138,30
     CONTROL         "Random",IDC_PLSEL_ROLE_RANDOM,"Button",BS_AUTOCHECKBOX | 
-                    WS_TABSTOP,10,31,45,10
+                    WS_TABSTOP,14,34,40,10
+    COMBOBOX        IDC_PLSEL_ROLE_LIST,63,33,75,50,CBS_DROPDOWNLIST | 
+                    WS_VSCROLL | WS_TABSTOP
+    GROUPBOX        "Race",IDC_STATIC,7,51,138,30
     CONTROL         "Random",IDC_PLSEL_RACE_RANDOM,"Button",BS_AUTOCHECKBOX | 
-                    WS_TABSTOP,10,60,45,10
+                    WS_TABSTOP,14,63,40,10
+    COMBOBOX        IDC_PLSEL_RACE_LIST,63,62,75,45,CBS_DROPDOWNLIST | 
+                    WS_VSCROLL | WS_TABSTOP
+    GROUPBOX        "Gender",IDC_STATIC,7,81,138,30
     CONTROL         "Random",IDC_PLSEL_GENDER_RANDOM,"Button",
-                    BS_AUTOCHECKBOX | WS_TABSTOP,10,95,40,10
+                    BS_AUTOCHECKBOX | WS_TABSTOP,14,93,40,10
+    COMBOBOX        IDC_PLSEL_GENDER_LIST,63,92,75,40,CBS_DROPDOWNLIST | 
+                    WS_VSCROLL | WS_TABSTOP
+    GROUPBOX        "Alignment",IDC_STATIC,7,111,138,30
     CONTROL         "Random",IDC_PLSEL_ALIGN_RANDOM,"Button",BS_AUTOCHECKBOX | 
-                    WS_TABSTOP,10,125,45,10
-    COMBOBOX        IDC_PLSEL_ROLE_LIST,60,30,75,50,CBS_DROPDOWNLIST | 
-                    WS_VSCROLL | WS_TABSTOP
-    COMBOBOX        IDC_PLSEL_RACE_LIST,60,60,75,45,CBS_DROPDOWNLIST | 
-                    WS_VSCROLL | WS_TABSTOP
-    COMBOBOX        IDC_PLSEL_ALIGN_LIST,60,125,75,45,CBS_DROPDOWNLIST | 
-                    WS_VSCROLL | WS_TABSTOP
-    COMBOBOX        IDC_PLSEL_GENDER_LIST,60,95,75,40,CBS_DROPDOWNLIST | 
+                    WS_TABSTOP,13,123,40,10
+    COMBOBOX        IDC_PLSEL_ALIGN_LIST,63,122,75,45,CBS_DROPDOWNLIST | 
                     WS_VSCROLL | WS_TABSTOP
 END
 
@@ -203,6 +204,7 @@ BEGIN
     DEFPUSHBUTTON   "OK",IDOK,82,188,50,14
 END
 
+
 #ifdef APSTUDIO_INVOKED
 /////////////////////////////////////////////////////////////////////////////
 //
@@ -277,17 +279,17 @@ BEGIN
     IDD_EXTCMD, DIALOG
     BEGIN
         LEFTMARGIN, 7
-        RIGHTMARGIN, 122
+        RIGHTMARGIN, 130
         TOPMARGIN, 7
-        BOTTOMMARGIN, 107
+        BOTTOMMARGIN, 110
     END
 
     IDD_PLAYER_SELECTOR, DIALOG
     BEGIN
         LEFTMARGIN, 7
-        RIGHTMARGIN, 137
+        RIGHTMARGIN, 145
         TOPMARGIN, 7
-        BOTTOMMARGIN, 157
+        BOTTOMMARGIN, 162
     END
 
     IDD_NHRIP, DIALOG