diff --git a/Source/Plugins/Plugin_PadSimple/Src/PadSimple.cpp b/Source/Plugins/Plugin_PadSimple/Src/PadSimple.cpp
index b0ccb9bb80..6aab0c92e9 100644
--- a/Source/Plugins/Plugin_PadSimple/Src/PadSimple.cpp
+++ b/Source/Plugins/Plugin_PadSimple/Src/PadSimple.cpp
@@ -189,7 +189,6 @@ void PAD_Initialize(SPADInitialize _PADInitialize)
 	dinput.Init((HWND)g_PADInitialize.hWnd);
 #elif defined(HAVE_X11) && HAVE_X11
 	GXdsp = (Display*)g_PADInitialize.hWnd;
-	XkbSetDetectableAutoRepeat(GXdsp, True, NULL);
 #endif
 	
 	LoadConfig();
diff --git a/Source/Plugins/Plugin_PadSimple/Src/SConscript b/Source/Plugins/Plugin_PadSimple/Src/SConscript
index f5fa308e2a..7d43cf153f 100644
--- a/Source/Plugins/Plugin_PadSimple/Src/SConscript
+++ b/Source/Plugins/Plugin_PadSimple/Src/SConscript
@@ -9,6 +9,10 @@ if not env['HAVE_X11']:
     print name + " must have X11 to be build"
     Return()
 
+if env['GLTEST']:
+    print name + " Doesn't work with testgl"
+    Return()
+
 files = [
 	"PadSimple.cpp",
 	]
diff --git a/Source/Plugins/Plugin_VideoOGL/Src/GLUtil.cpp b/Source/Plugins/Plugin_VideoOGL/Src/GLUtil.cpp
index dcfac3376f..a7b27246ab 100644
--- a/Source/Plugins/Plugin_VideoOGL/Src/GLUtil.cpp
+++ b/Source/Plugins/Plugin_VideoOGL/Src/GLUtil.cpp
@@ -386,7 +386,7 @@ bool OpenGL_Create(SVideoInitialize &_VideoInitialize, int _iwidth, int _iheight
                           GLX_DEPTH_SIZE, 24,
                           GLX_SAMPLE_BUFFERS_ARB, g_Config.iMultisampleMode, GLX_SAMPLES_ARB, 1, None };
     GLWin.dpy = XOpenDisplay(0);
-	g_VideoInitialize.pWindowHandle = (HWND)GLWin.dpy;
+    g_VideoInitialize.pWindowHandle = (HWND)GLWin.dpy;
     GLWin.screen = DefaultScreen(GLWin.dpy);
 
     GLWin.fs = g_Config.bFullscreen; //Set to setting in Options
@@ -417,6 +417,7 @@ bool OpenGL_Create(SVideoInitialize &_VideoInitialize, int _iwidth, int _iheight
                            vi->visual, AllocNone);
     GLWin.attr.colormap = cmap;
     GLWin.attr.border_pixel = 0;
+    XkbSetDetectableAutoRepeat(GLWin.dpy, True, NULL);
 
 #if defined(HAVE_XXF86VM) && HAVE_XXF86VM
     // get a connection
diff --git a/Source/Plugins/Plugin_VideoOGL/Src/X11Window.cpp b/Source/Plugins/Plugin_VideoOGL/Src/X11Window.cpp
index 389c3a7fc3..db592b5cc5 100644
--- a/Source/Plugins/Plugin_VideoOGL/Src/X11Window.cpp
+++ b/Source/Plugins/Plugin_VideoOGL/Src/X11Window.cpp
@@ -92,6 +92,8 @@ X11Window::X11Window(int _iwidth, int _iheight) {
     attr.colormap = cmap;
     attr.border_pixel = 0;
 
+    XkbSetDetectableAutoRepeat(dpy, True, NULL);
+
     // get a connection
     XF86VidModeQueryVersion(dpy, &vidModeMajorVersion, &vidModeMinorVersion);
 
diff --git a/Source/Plugins/Plugin_VideoOGL/Src/X11Window.h b/Source/Plugins/Plugin_VideoOGL/Src/X11Window.h
index acd762955a..023c19de3b 100644
--- a/Source/Plugins/Plugin_VideoOGL/Src/X11Window.h
+++ b/Source/Plugins/Plugin_VideoOGL/Src/X11Window.h
@@ -11,6 +11,7 @@
 #include <X11/keysym.h>
 
 #include <X11/extensions/xf86vmode.h>
+#include <X11/XKBlib.h>
 
 class X11Window : public GLWindow 
 {