diff --git a/src/drivers/win/cheat.cpp b/src/drivers/win/cheat.cpp
index 3691d820..8986f601 100644
--- a/src/drivers/win/cheat.cpp
+++ b/src/drivers/win/cheat.cpp
@@ -26,7 +26,8 @@
 #include "..\..\cart.h"
 
 HWND hCheat; //mbg merge 7/19/06 had to add 
-int CheatWindow,CheatStyle; //mbg merge 7/19/06 had to add
+int CheatWindow;
+int CheatStyle=1;
 
 #define GGLISTSIZE 128 //hopefully this is enough for all cases
 
@@ -499,6 +500,8 @@ void ConfigCheats(HWND hParent) {
 		if (CheatStyle) hCheat = CreateDialog(fceu_hInstance,"CHEATCONSOLE",NULL,CheatConsoleCallB);
 		else DialogBox(fceu_hInstance,"CHEATCONSOLE",hParent,CheatConsoleCallB);
 	}
+	else
+	 SetFocus(hCheat);
 }
 
 BOOL CALLBACK GGConvCallB(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) {
diff --git a/src/drivers/win/res.rc b/src/drivers/win/res.rc
index 288c22d4..2f918442 100644
Binary files a/src/drivers/win/res.rc and b/src/drivers/win/res.rc differ