diff --git a/UI/GameSettingsScreen.cpp b/UI/GameSettingsScreen.cpp
index a9915ad083..b265129fe1 100644
--- a/UI/GameSettingsScreen.cpp
+++ b/UI/GameSettingsScreen.cpp
@@ -262,6 +262,7 @@ void GameSettingsScreen::CreateViews() {
 	style->SetEnabledPtr(&g_Config.bShowTouchControls);
 
 #if defined(_WIN32) && !defined(USING_QT_UI)
+	controlsSettings->Add(new ItemHeader(c->T("Keyboard", "Keyboard Control Settings")));
 	controlsSettings->Add(new CheckBox(&g_Config.bIgnoreWindowsKey, c->T("Ignore Windows Key")));
 #endif
 
diff --git a/Windows/WndMainWindow.cpp b/Windows/WndMainWindow.cpp
index 0d8cf5bfac..38e87b7fc4 100644
--- a/Windows/WndMainWindow.cpp
+++ b/Windows/WndMainWindow.cpp
@@ -603,6 +603,7 @@ namespace MainWindow
 		TranslateMenuItem(ID_OPTIONS_LANGUAGE);
 		TranslateMenuItem(ID_OPTIONS_TOPMOST);
 		TranslateMenuItem(ID_OPTIONS_PAUSE_FOCUS);
+		TranslateMenuItem(ID_OPTIONS_IGNOREWINKEY);
 		TranslateMenuItem(ID_OPTIONS_MORE_SETTINGS);
 		TranslateMenuItem(ID_OPTIONS_CONTROLS);
 		TranslateMenuItem(ID_OPTIONS_STRETCHDISPLAY);
@@ -1283,6 +1284,10 @@ namespace MainWindow
 					NativeMessageReceived("language screen", "");
 					break;
 
+				case ID_OPTIONS_IGNOREWINKEY:
+					g_Config.bIgnoreWindowsKey = !g_Config.bIgnoreWindowsKey;
+					break;
+
 				case ID_OPTIONS_SCREENAUTO: SetInternalResolution(RESOLUTION_AUTO); break;
 				case ID_OPTIONS_SCREEN1X:   SetInternalResolution(RESOLUTION_NATIVE); break;
 				case ID_OPTIONS_SCREEN2X:   SetInternalResolution(RESOLUTION_2X); break;
@@ -1750,6 +1755,7 @@ namespace MainWindow
 		CHECKITEM(ID_EMULATION_SOUND, g_Config.bEnableSound);
 		CHECKITEM(ID_TEXTURESCALING_DEPOSTERIZE, g_Config.bTexDeposterize);
 		CHECKITEM(ID_EMULATION_CHEATS, g_Config.bEnableCheats);
+		CHECKITEM(ID_OPTIONS_IGNOREWINKEY, g_Config.bIgnoreWindowsKey);
 
 		static const int zoomitems[11] = {
 			ID_OPTIONS_SCREENAUTO,
diff --git a/Windows/ppsspp.rc b/Windows/ppsspp.rc
index e6f93373d2..d00edb3a0c 100644
--- a/Windows/ppsspp.rc
+++ b/Windows/ppsspp.rc
@@ -416,6 +416,7 @@ BEGIN
     BEGIN
         MENUITEM "Keep PPSSPP On Top",                      ID_OPTIONS_TOPMOST
         MENUITEM "Pause When Not Focused",                  ID_OPTIONS_PAUSE_FOCUS
+		MENUITEM "Ignore Windows Key",                      ID_OPTIONS_IGNOREWINKEY
         MENUITEM "More Settings...",                        ID_OPTIONS_MORE_SETTINGS
         MENUITEM "Control Mapping...",                      ID_OPTIONS_CONTROLS
         MENUITEM "Language...",                             ID_OPTIONS_LANGUAGE
diff --git a/Windows/resource.h b/Windows/resource.h
index c746f0ebb1..6ac2a93f52 100644
--- a/Windows/resource.h
+++ b/Windows/resource.h
@@ -299,6 +299,7 @@
 #define ID_MEMVIEW_COPYVALUE_32          40143
 #define ID_EMULATION_SWITCH_UMD          40144
 #define ID_DEBUG_EXTRACTFILE             40145
+#define ID_OPTIONS_IGNOREWINKEY          40146
 
 // Dummy option to let the buffered rendering hotkey cycle through all the options.
 #define ID_OPTIONS_BUFFEREDRENDERINGDUMMY 40500