diff --git a/sys/windows/windmain.c b/sys/windows/windmain.c
index 2cc92ac2a..0fb6eadb0 100644
--- a/sys/windows/windmain.c
+++ b/sys/windows/windmain.c
@@ -192,8 +192,8 @@ _CrtSetReportFile(_CRT_ASSERT, _CRTDBG_FILE_STDERR);*/
 #endif
 #endif
 
-    set_emergency_io();
 #ifndef MSWIN_GRAPHICS
+    set_emergency_io();
     early_init(argc, argv); /* already in WinMain for MSWIN_GRAPHICS */
 #endif
 
@@ -243,6 +243,15 @@ _CrtSetReportFile(_CRT_ASSERT, _CRTDBG_FILE_STDERR);*/
         windowtype = "tty";
 #endif
     }
+#ifdef MSWIN_GRAPHICS
+    if (!strcmp(windowtype, "tty"))
+        windowtype = "mswin";
+#endif
+#ifdef TTY_GRAPHICS
+    if (!strcmp(windowtype, "mswin"))
+        windowtype = "tty";
+#endif
+
     choose_windows(
         windowtype); /* sets all the window port function pointers */
 
diff --git a/win/win32/NetHackW.c b/win/win32/NetHackW.c
index bee362598..431e5ee99 100644
--- a/win/win32/NetHackW.c
+++ b/win/win32/NetHackW.c
@@ -216,6 +216,7 @@ WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine,
     windowprocs.win_raw_print_bold = mswin_raw_print_bold;
     windowprocs.win_nhgetch = mswin_nhgetch;
     windowprocs.win_wait_synch = mswin_wait_synch;
+    windowprocs.win_number_pad = mswin_number_pad;
 
     /* let nethackw_main do the argument processing */
     nethackw_main(argc, argv);