diff --git a/src/XGridCtrl.cpp b/src/XGridCtrl.cpp
index af49c0cb..86d4d6ae 100644
--- a/src/XGridCtrl.cpp
+++ b/src/XGridCtrl.cpp
@@ -1577,7 +1577,8 @@ XGridCtrl::OnArrow(puz::GridDirection arrowDirection, int mod)
     {
         // Check to see if the next square is part of the current word
         if (m_focusedWord &&
-            m_focusedWord->Contains(m_focusedSquare->Next(arrowDirection)))
+            m_focusedWord->Contains(m_focusedSquare->Next(arrowDirection)) &&
+            m_focusedSquare->Next(arrowDirection)->IsWhite())
         {
             SetFocusedSquare(m_focusedSquare->Next(arrowDirection),
                              m_focusedWord);