diff --git a/source/in_x11.c b/source/in_x11.c
index 17f8fd4..645a2a3 100644
--- a/source/in_x11.c
+++ b/source/in_x11.c
@@ -427,6 +427,8 @@ IN_Init(void)
 	_windowed_mouse = Cvar_Get ("_windowed_mouse","0",CVAR_ARCHIVE,"None");
 	m_filter = Cvar_Get ("m_filter","0",CVAR_ARCHIVE,"None");
 
+	XAutoRepeatOff(x_disp);
+
 	if (COM_CheckParm("-nomouse")) return 1;
 #ifdef HAVE_DGA
 	in_dgamouse = Cvar_Get ("in_dgamouse", "0", CVAR_ROM,
diff --git a/source/vid_x11.c b/source/vid_x11.c
index 22f4a81..9199def 100644
--- a/source/vid_x11.c
+++ b/source/vid_x11.c
@@ -684,7 +684,6 @@ VID_Shutdown(void)
 	Sys_Printf("VID_Shutdown\n");
 	if (x_disp) {
 		x11_restore_vidmode();
-		XAutoRepeatOn(x_disp);
 		x11_close_display();
 		x_disp = 0;
 	}