diff --git a/stepmania/src/RageDisplay_OGL.cpp b/stepmania/src/RageDisplay_OGL.cpp
index a96fd27a1d..966b5cebd3 100644
--- a/stepmania/src/RageDisplay_OGL.cpp
+++ b/stepmania/src/RageDisplay_OGL.cpp
@@ -412,9 +412,12 @@ void RageDisplay_OGL::Update(float fDeltaTime)
 	wind->Update(fDeltaTime);
 
 #if defined(unix)
-	/* Disable the screensaver. */
-	ASSERT( g_X11Display );
-	XForceScreenSaver( g_X11Display, ScreenSaverReset );
+	if( PREFSMAN->m_bDisableScreenSaver )
+	{
+		/* Disable the screensaver. */
+		ASSERT( g_X11Display );
+		ForceScreenSaver( g_X11Display, ScreenSaverReset );
+	}
 #endif
 }