diff --git a/libroar/RoarCanvasCommands.py b/libroar/RoarCanvasCommands.py
index 1932739..6eb577a 100644
--- a/libroar/RoarCanvasCommands.py
+++ b/libroar/RoarCanvasCommands.py
@@ -67,7 +67,8 @@ class RoarCanvasCommands(RoarCanvasCommandsFile, RoarCanvasCommandsEdit, RoarCan
             textItems.append("*")
         self.parentFrame.statusBar.SetStatusText(" | ".join(textItems))
         if "undoLevel" in self.lastPanelState:
-            if self.lastPanelState["undoLevel"] >= 0:
+            if  (self.lastPanelState["undoLevel"] >= 0)  \
+            and (self.lastPanelState["undoLevel"] < (len(self.parentCanvas.canvas.journal.patchesUndo) - 1)):
                 self.parentFrame.menuItemsById[self.canvasUndo.attrDict["id"]].Enable(True)
                 toolBar = self.parentFrame.toolBarItemsById[self.canvasUndo.attrDict["id"]].GetToolBar()
                 toolBar.EnableTool(self.canvasUndo.attrDict["id"], True)