diff --git a/ChangeLog b/ChangeLog
index 282270d75..65d1eae3a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Thu Dec  2 11:00:00 1999  Richard Frith-Macdonald <richard@brainstorm.co.uk>
+
+	* Source/NSMenuView.m: ([-trackWithEvent:]) Removed spurious code
+	that caused the bug of submenus being closed when you click on them!
+	Sumbenus should only be closed at the end of a drag operation or if
+	you click on their corresponding item in the parent menu.
+
 Thu Dec  2  8:23:00 1999  Richard Frith-Macdonald <richard@brainstorm.co.uk>
 
 	* Source/NSImage.m: Use opacity values from image reps to cache more
diff --git a/Source/NSMenuView.m b/Source/NSMenuView.m
index abd5deeef..660931cf5 100644
--- a/Source/NSMenuView.m
+++ b/Source/NSMenuView.m
@@ -793,9 +793,6 @@ static float GSMenuBarHeight = 25.0; // A wild guess.
 
       if (![menuv_menu isFollowTransient])
 	[self setHighlightedItemIndex: -1];
-
-      if (![[menuv_items_link objectAtIndex: index] hasSubmenu])
-	menuv_keepAttachedMenus = NO;
     }
 
   // Close menus if needed.