diff --git a/ChangeLog b/ChangeLog
index 866de694d..9e9c26ab0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,10 +1,16 @@
+2006-03-01  Richard Frith-Macdonald <rfm@gnu.org>
+
+	* Source/NSMenuView.m: ([-rectOfItemAtIndex:]) Fix bug #15934 by
+	removing some bogus code left over from incorporating horizontal
+	menu.
+
 2006-02-24  Quentin Mathe <qmathe@club-internet.fr>
 
-    * Source/GSToolbar.m: Fixed mismatched method return type between
-    header and implementation.
-    * Source/GSToolbarView.m: Updated code to reference some external classes
-    lazily with NSClassFromString.
-    These fixes avoids some compiler warnings.
+	* Source/GSToolbar.m: Fixed mismatched method return type between
+	header and implementation.
+	* Source/GSToolbarView.m: Updated code to reference some external
+	classes lazily with NSClassFromString.
+	These fixes avoids some compiler warnings.
 
 2006-02-22 23:03 Gregory John Casamento <greg_casamento@yahoo.com>
 
diff --git a/Source/NSMenuView.m b/Source/NSMenuView.m
index 26d43e207..dbd73512b 100644
--- a/Source/NSMenuView.m
+++ b/Source/NSMenuView.m
@@ -911,19 +911,9 @@ _addLeftBorderOffsetToRect(NSRect aRect)
        */
       if (_horizontal == NO)
 	{
-	  if (![_attachedMenu _ownedByPopUp])
-	    {
-	      theRect.origin.y
-		= 2 + (_cellSize.height * ([_itemCells count] - index - 1));
-	      theRect.origin.x = 1;
-	      theRect.size.width -= 2;
-	    }
-	  else
-	    {
-	      theRect.origin.y
-		= _cellSize.height * ([_itemCells count] - index - 1);
-	      theRect.origin.x = _leftBorderOffset;
-	    }
+	  theRect.origin.y
+	    = _cellSize.height * ([_itemCells count] - index - 1);
+	  theRect.origin.x = _leftBorderOffset;
 	}
       else
 	{