diff --git a/gui/mainMenuBar.py b/gui/mainMenuBar.py
index 413098b61..b062cd060 100644
--- a/gui/mainMenuBar.py
+++ b/gui/mainMenuBar.py
@@ -179,6 +179,21 @@ class MainMenuBar(wx.MenuBar):
         self.Enable(wx.ID_COPY, enable)
         self.Enable(self.exportSkillsNeededId, enable)
 
+        command_history = self.mainFrame.command.GetCommands()
+        current_command = self.mainFrame.command.GetCurrentCommand()
+
+        self.Enable(wx.ID_UNDO, True)
+        self.Enable(wx.ID_REDO, True)
+
+        if len(command_history) == 0:
+            self.Enable(wx.ID_UNDO, False)
+            self.Enable(wx.ID_REDO, False)
+        else:
+            if current_command not in command_history:
+                self.Enable(wx.ID_UNDO, False)
+            if current_command == command_history[len(command_history) - 1]:
+                self.Enable(wx.ID_REDO, False)
+
         sChar = Character.getInstance()
         charID = self.mainFrame.charSelection.getActiveCharacter()
         char = sChar.getCharacter(charID)