diff --git a/src/event.cxx b/src/event.cxx
index a29ee99..106e294 100644
--- a/src/event.cxx
+++ b/src/event.cxx
@@ -3501,6 +3501,9 @@ CEvent::DecorAutoShift ()
   }
   else
   {
+    if (m_bDemoRec || m_bDemoPlay)
+      return;
+
     switch (m_mouseSprite)
     {
     case SPRITE_ARROWL:
@@ -3542,9 +3545,6 @@ CEvent::DecorAutoShift ()
 
   m_bShift = false;
 
-  if (m_bDemoRec || m_bDemoPlay)
-    return;
-
   if (!byKeyboard && (!m_bFullScreen || m_scrollSpeed == 0))
     return;