1 files changed, 6 insertions, 1 deletions
diff --git a/src/game_tab/right_panel/editor/EditorCanvas.cpp b/src/game_tab/right_panel/editor/EditorCanvas.cpp
index ab56a8c..3120177 100644
--- a/src/game_tab/right_panel/editor/EditorCanvas.cpp
+++ b/src/game_tab/right_panel/editor/EditorCanvas.cpp
@@ -183,8 +183,13 @@ void EditorCanvas::MouseEvent(wxMouseEvent &event) {
 void EditorCanvas::SetMoves(HalfMove *moves, HalfMove *current) {
   CGEditor::status.Moves = moves;
   CGEditor::status.CurrentMove = current;
-
   Refresh();
+  // Focus on current move:
+  if(current!=nullptr){
+    Update(); // Wait for preview call to Refresh() to finish (otherwise heisenbugs)
+    CGEditor::FocusOnMove(current);
+    Refresh();
+  }
 }
 
 void EditorCanvas::ApplyPreferences(){