diff --git a/Source/Plugins/Plugin_Wiimote/Src/Config.cpp b/Source/Plugins/Plugin_Wiimote/Src/Config.cpp
index 2b112e93d0..0358523295 100644
--- a/Source/Plugins/Plugin_Wiimote/Src/Config.cpp
+++ b/Source/Plugins/Plugin_Wiimote/Src/Config.cpp
@@ -122,10 +122,10 @@ static int wmDefaultControls[] =
 	VK_OEM_PERIOD,
 	VK_OEM_2,	// /
 #elif defined(HAVE_X11) && HAVE_X11
-	'Z',
-	'X',
-	'C',
-	'V',
+	XK_z,
+	XK_x,
+	XK_c,
+	XK_v,
 	XK_equal,
 	XK_minus,
 	XK_BackSpace,
@@ -133,8 +133,8 @@ static int wmDefaultControls[] =
 	XK_Right,
 	XK_Up,
 	XK_Down,
-	'N',
-	'M',
+	XK_n,
+	XK_m,
 	XK_comma,
 	XK_period,
 	XK_slash,
diff --git a/Source/Plugins/Plugin_Wiimote/Src/FillReport.cpp b/Source/Plugins/Plugin_Wiimote/Src/FillReport.cpp
index 1cb1d1d87a..54759279cc 100644
--- a/Source/Plugins/Plugin_Wiimote/Src/FillReport.cpp
+++ b/Source/Plugins/Plugin_Wiimote/Src/FillReport.cpp
@@ -308,7 +308,7 @@ bool IsKey(int Key)
 		{
 			Ret = GetAsyncKeyState(MapKey);		// Keyboard (Windows)
 #else
-		if (MapKey < 256 || (MapKey >= 0xff50 && MapKey <= 0xff54))
+		if (MapKey < 256 || MapKey >= 0xf000)
 		{
 			Ret = KeyStatus[Key];			// Keyboard (Linux)
 #endif