diff --git a/server/CPrimaryScreen.cpp b/server/CPrimaryScreen.cpp
index cfe7d014..cbd114a4 100644
--- a/server/CPrimaryScreen.cpp
+++ b/server/CPrimaryScreen.cpp
@@ -109,13 +109,13 @@ CPrimaryScreen::enter(SInt32 x, SInt32 y, bool forScreensaver)
 	CLock lock(&m_mutex);
 	assert(m_active == true);
 
-	enterNoWarp();
 	if (!forScreensaver) {
 		warpCursor(x, y);
 	}
 	else {
 		onEnterScreensaver();
 	}
+	enterNoWarp();
 }
 
 void