diff --git a/stepmania/src/RageDisplay_OGL.cpp b/stepmania/src/RageDisplay_OGL.cpp
index 54d8e052d1..b2734a3006 100644
--- a/stepmania/src/RageDisplay_OGL.cpp
+++ b/stepmania/src/RageDisplay_OGL.cpp
@@ -417,6 +417,12 @@ RageDisplay_OGL::RageDisplay_OGL( VideoModeParams p, bool bAllowUnacceleratedRen
 void RageDisplay_OGL::Update(float fDeltaTime)
 {
 	wind->Update(fDeltaTime);
+
+#if defined(unix)
+	/* Disable the screensaver. */
+	ASSERT( g_X11Display );
+	XForceScreenSaver( g_X11Display, ScreenSaverReset );
+#endif
 }
 
 bool RageDisplay_OGL::IsSoftwareRenderer()