diff --git a/win32/wsnes9x.cpp b/win32/wsnes9x.cpp
index ea9d8f9e..bdb5c7f5 100644
--- a/win32/wsnes9x.cpp
+++ b/win32/wsnes9x.cpp
@@ -3257,8 +3257,8 @@ int WINAPI WinMain(
     WinSaveConfigFile ();
 	WinLockConfigFile ();
 
-    ChangeInputDevice();
     ControllerOptionsFromControllers();
+    ChangeInputDevice();
 
     WinInit (hInstance);
 	if(GUI.HideMenu)