diff --git a/src/apps/sudoku/SudokuView.cpp b/src/apps/sudoku/SudokuView.cpp
index 43aacf4728..984cf084ae 100644
--- a/src/apps/sudoku/SudokuView.cpp
+++ b/src/apps/sudoku/SudokuView.cpp
@@ -847,16 +847,18 @@ SudokuView::MouseMoved(BPoint where, uint32 transit,
 	}
 
 	uint32 x, y;
-	if (!_GetFieldFor(where, x, y)
+	bool isField = _GetFieldFor(where, x, y);
+	if (isField) {
+		fKeyboardX = x;
+		fKeyboardY = y;
+	}
+	if (!isField
 		|| (fField->FlagsAt(x, y) & kInitialValue) != 0
 		|| !fShowCursor && fField->ValueAt(x, y) != 0) {
 		_RemoveHint();
 		return;
 	}
 
-	fKeyboardX = x;
-	fKeyboardY = y;
-
 	if (fShowHintX == x && fShowHintY == y)
 		return;