diff --git a/Source/Plugins/Plugin_Wiimote/Src/FillReport.cpp b/Source/Plugins/Plugin_Wiimote/Src/FillReport.cpp
index 91dfa02d9b..fbdc5bbe20 100644
--- a/Source/Plugins/Plugin_Wiimote/Src/FillReport.cpp
+++ b/Source/Plugins/Plugin_Wiimote/Src/FillReport.cpp
@@ -329,7 +329,11 @@ bool IsKey(int Key)
 		if ((Key == EWM_SHAKE && GetAsyncKeyState(VK_MBUTTON))
 			|| (Key == EWM_A && GetAsyncKeyState(VK_LBUTTON))
 			|| (Key == EWM_B && GetAsyncKeyState(VK_RBUTTON)))
-			Ret = 1;
+		{
+			float x, y;
+			GetMousePos(x, y);
+			Ret = !(x < 0 || x > 1 || y < 0 || y > 1);
+		}
 #endif
 
 	}
diff --git a/Source/Plugins/Plugin_Wiimote/Src/main.cpp b/Source/Plugins/Plugin_Wiimote/Src/main.cpp
index 5d8842ae22..b2e7752b13 100644
--- a/Source/Plugins/Plugin_Wiimote/Src/main.cpp
+++ b/Source/Plugins/Plugin_Wiimote/Src/main.cpp
@@ -426,12 +426,8 @@ bool IsFocus()
 	HWND RenderingWindow = g_WiimoteInitialize.hWnd;
 	HWND Parent = GetParent(RenderingWindow);
 	HWND TopLevel = GetParent(Parent);
-	// Allow updates when the config window is in focus to
-	HWND Config = NULL;
-	if (m_BasicConfigFrame)
-		Config = (HWND)m_BasicConfigFrame->GetHWND();
 	// Support both rendering to main window and not
-	if (GetForegroundWindow() == TopLevel || GetForegroundWindow() == RenderingWindow || GetForegroundWindow() == Config)
+	if (GetForegroundWindow() == TopLevel || GetForegroundWindow() == RenderingWindow)
 		return true;
 	else
 		return false;