diff --git a/ChangeLog b/ChangeLog
index 1d58f5a28..0b391d866 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2015-01-11  Fred Kiefer <FredKiefer@gmx.de>
+
+	* Source/NSMenu.m (-update): Added case to menu autoenabler to
+	disable supermenus that have empty submenus, when there is no
+	validator.
+	Patch by Paul Landers <paul.landers@testplant.com>.
+
 2015-01-11  Fred Kiefer <FredKiefer@gmx.de>
 
 	* Source/NSTextView.m: Fix bizarre behavior with undo/redo
diff --git a/Source/NSMenu.m b/Source/NSMenu.m
index 96b2173f6..8ea08bee4 100644
--- a/Source/NSMenu.m
+++ b/Source/NSMenu.m
@@ -1192,7 +1192,11 @@ static BOOL menuBarVisible = YES;
 	        {
 	          shouldBeEnabled = [validator validateUserInterfaceItem: item];
 	        }
-	      else
+              else if ([item hasSubmenu] && [[item submenu] numberOfItems] == 0)
+                {
+                  shouldBeEnabled = NO;
+                }
+ 	      else
 	        {
 	          shouldBeEnabled = YES;
 	        }