diff --git a/src/main/java/edu/rpi/legup/ui/PuzzleEditorPanel.java b/src/main/java/edu/rpi/legup/ui/PuzzleEditorPanel.java
index 3b74b8bcf..c8f5e24f5 100644
--- a/src/main/java/edu/rpi/legup/ui/PuzzleEditorPanel.java
+++ b/src/main/java/edu/rpi/legup/ui/PuzzleEditorPanel.java
@@ -386,7 +386,8 @@ public void onRedo(boolean isBottom, boolean isTop) {
 
     @Override
     public void onClearHistory() {
-
+        undo.setEnabled(false);
+        redo.setEnabled(false);
     }
 
     public BoardView getBoardView() {