diff --git a/twander.py b/twander.py
index c530f41..d827b04 100755
--- a/twander.py
+++ b/twander.py
@@ -4,7 +4,7 @@
 # For Updates See:  http://www.tundraware.com/Software/twander
 
 PROGNAME = "twander"
-RCSID = "$Id: twander.py,v 2.23 2002/12/18 21:01:45 tundra Exp $"
+RCSID = "$Id: twander.py,v 2.24 2002/12/18 21:38:55 tundra Exp $"
 VERSION = RCSID.split()[2]
 
 
@@ -437,8 +437,13 @@
     # Close the config file
     cf.close()
 
-    # Set the Command Menu Contents
-    UI.CmdBtn['menu'] = UI.CmdBtn.menu
+    
+    # Set the Command Menu Contents, if any,
+    # and enable the menu if it has entries
+    
+    if UI.CmdBtn.menu.index(END):
+        UI.CmdBtn['menu'] = UI.CmdBtn.menu
+        UI.CmdBtn.configure(state=NORMAL)
 
     # Dump tables if we're debugging
     if DEBUG:
@@ -702,7 +707,7 @@
         
         # Setup the Command Menu
 
-        self.CmdBtn = Menubutton(self.mBar, text=COMMANDMENU, underline=0, font=(FNAME, FSZ, "bold"))
+        self.CmdBtn = Menubutton(self.mBar, text=COMMANDMENU, underline=0, state=DISABLED, font=(FNAME, FSZ, "bold"))
         self.CmdBtn.menu = Menu(self.CmdBtn, font=("courier", FSZ, "bold"))
         self.CmdBtn.pack(side=LEFT, padx='2m')