diff --git a/source/Frame.cpp b/source/Frame.cpp
index e4960e9b..38ff530f 100644
--- a/source/Frame.cpp
+++ b/source/Frame.cpp
@@ -1312,7 +1312,7 @@ LRESULT CALLBACK FrameWndProc (
 			{
 				RevealCursor();
 			}
-			else if (g_nAppMode == MODE_RUNNING)
+			else if (g_nAppMode == MODE_RUNNING || g_nAppMode == MODE_STEPPING)
 			{
 				if (!sg_Mouse.IsEnabled())
 				{
@@ -1389,7 +1389,7 @@ LRESULT CALLBACK FrameWndProc (
         DrawCrosshairs(x,y);
 	    JoySetPosition(x-viewportx-2, g_nViewportCX-4, y-viewporty-2, g_nViewportCY-4);
       }
-	  else if (sg_Mouse.IsActiveAndEnabled() && (g_nAppMode == MODE_RUNNING))
+	  else if (sg_Mouse.IsActiveAndEnabled() && (g_nAppMode == MODE_RUNNING || g_nAppMode == MODE_STEPPING))
 	  {
 			if (g_bLastCursorInAppleViewport)
 				break;
@@ -1420,7 +1420,7 @@ LRESULT CALLBACK FrameWndProc (
 		if (wparam == IDEVENT_TIMER_MOUSE)
 		{
 			// NB. Need to check /g_bAppActive/ since WM_TIMER events still occur after AppleWin app has lost focus
-			if (g_bAppActive && sg_Mouse.IsActiveAndEnabled() && (g_nAppMode == MODE_RUNNING))
+			if (g_bAppActive && sg_Mouse.IsActiveAndEnabled() && (g_nAppMode == MODE_RUNNING || g_nAppMode == MODE_STEPPING))
 			{
 				if (!g_bLastCursorInAppleViewport)
 					break;