diff --git a/src/main/java/com/charego/freecellfx/view/GameCanvas.java b/src/main/java/com/charego/freecellfx/view/GameCanvas.java
index ab0cdb5..a060937 100644
--- a/src/main/java/com/charego/freecellfx/view/GameCanvas.java
+++ b/src/main/java/com/charego/freecellfx/view/GameCanvas.java
@@ -107,10 +107,8 @@ public class GameCanvas extends Canvas {
             if (e.isControlDown()) {
                 if (e.getCode() == KeyCode.Y) {
                     game.redo();
-                    updateView();
                 } else if (e.getCode() == KeyCode.Z) {
                     game.undo();
-                    updateView();
                 }
             } else {
                 if (e.getCode() == KeyCode.F2) {
@@ -120,9 +118,9 @@ public class GameCanvas extends Canvas {
                         fromPile.toggleSelected();
                     }
                     fromPile = null;
-                    updateView();
                 }
             }
+            updateView();
         }
     }
 
@@ -135,6 +133,7 @@ public class GameCanvas extends Canvas {
                     fromPile.toggleSelected();
                 }
                 fromPile = null;
+                updateView();
                 return;
             }
             if (fromPile == null) {
@@ -148,20 +147,20 @@ public class GameCanvas extends Canvas {
                 fromPile.toggleSelected();
                 for (int i = 4; i < 8; i++) {
                     if (game.tryMove(fromPile.getPile(), pileViews[i].getPile())) {
-                        updateView();
                         checkEndingConditions();
                         break;
                     }
                 }
                 fromPile = null;
+                updateView();
             } else {
                 // Try moving to other cell.
                 fromPile.toggleSelected();
                 if (game.tryMove(fromPile.getPile(), clickedPile.getPile())) {
-                    updateView();
                     checkEndingConditions();
                 }
                 fromPile = null;
+                updateView();
             }
         }
     }