diff --git a/Source/Core/DolphinWX/Src/Frame.cpp b/Source/Core/DolphinWX/Src/Frame.cpp
index 83fe319a64..357cb6c21d 100644
--- a/Source/Core/DolphinWX/Src/Frame.cpp
+++ b/Source/Core/DolphinWX/Src/Frame.cpp
@@ -823,17 +823,14 @@ void CFrame::OnKeyDown(wxKeyEvent& event)
 		else if (! (Core::GetState() == Core::CORE_RUN && bRenderToMain && event.GetEventObject() == this))
 			event.Skip();
 
-#ifdef _WIN32
-		if(event.GetKeyCode() == 'M', '3', '4', '5', '6', '7') // Send this to the video plugin WndProc
-		{
-			PostMessage((HWND)Core::GetWindowHandle(), WM_USER, WM_USER_KEYDOWN, event.GetKeyCode());
-		}
-#elif defined(HAVE_X11) && HAVE_X11 && defined(HAVE_GTK2) && HAVE_GTK2 && defined(wxGTK)
 		if (event.GetKeyCode() >= '3' && event.GetKeyCode() <= '7') // Send this to the video plugin
 		{
+#ifdef _WIN32
+			PostMessage((HWND)Core::GetWindowHandle(), WM_USER, WM_USER_KEYDOWN, event.GetKeyCode());
+#elif defined(HAVE_X11) && HAVE_X11 && defined(HAVE_GTK2) && HAVE_GTK2 && defined(wxGTK)
 			X11_SendKeyEvent(event.GetKeyCode());
-		}
 #endif
+		}
 
 		// Send the keyboard status to the Input plugin
 		CPluginManager::GetInstance().GetPad(0)->PAD_Input(event.GetKeyCode(), 1); // 1 = Down
diff --git a/Source/Plugins/Plugin_GCPadNew/Plugin_GCPadNew.vcproj b/Source/Plugins/Plugin_GCPadNew/Plugin_GCPadNew.vcproj
index f7c62c9a59..625ff1ddb2 100644
--- a/Source/Plugins/Plugin_GCPadNew/Plugin_GCPadNew.vcproj
+++ b/Source/Plugins/Plugin_GCPadNew/Plugin_GCPadNew.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="9.00"
+	Version="9,00"
 	Name="Plugin_GCPadNew"
 	ProjectGUID="{1C3A7A91-A97F-4C7C-B45D-26F2242904D7}"
 	RootNamespace="Plugin_GCPadNew"
@@ -621,18 +621,6 @@
 					>
 				</File>
 			</Filter>
-			<Filter
-				Name="Xlib"
-				>
-				<File
-					RelativePath=".\Src\ControllerInterface\Xlib\Xlib.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\Src\ControllerInterface\Xlib\Xlib.h"
-					>
-				</File>
-			</Filter>
 		</Filter>
 		<Filter
 			Name="ControllerEmu"