event.Check(win.lineNumbers)
             elif id == ID_AUTO_SAVESETTINGS:
                 event.Check(self.autoSaveSettings)
+                event.Enable(self.config is not None)
             elif id == ID_SAVESETTINGS:
                 event.Enable(self.config is not None and
                              hasattr(self, 'DoSaveSettings'))
                 
             elif id == ID_EXECSTARTUPSCRIPT:
                 event.Check(self.execStartupScript)
+                event.Enable(self.config is not None)
 
             elif id == ID_SAVEHISTORY:
-                event.Check(self.saveHistory and self.dataDir is not None)
+                event.Check(self.saveHistory)
+                event.Enable(self.dataDir is not None)
             elif id == ID_EDITSTARTUPSCRIPT:
                 event.Enable(hasattr(self, 'EditStartupScript'))
-
+                event.Enable(self.dataDir is not None)
+                
             elif id == ID_FIND:
                 event.Enable(hasattr(win, 'DoFindNext'))
             elif id == ID_FINDNEXT: