diff --git a/ChangeLog b/ChangeLog
index 749aa6929..620459f83 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2013-09-27 German Arias <germanandre@gmx.es>
+
+	* Source/NSMenuView.m (-locationForSubmenu:): Don't change the location
+	of submenu if menu is horizontal and style is NSMacintoshInterfaceStyle.
+
 2013-09-27  Fred Kiefer <FredKiefer@gmx.de>
 
 	* Source/NSBrowserCell.m (-drawInteriorWithFrame:inView:): Don't
diff --git a/Source/NSMenuView.m b/Source/NSMenuView.m
index ff6356258..e8986e06a 100644
--- a/Source/NSMenuView.m
+++ b/Source/NSMenuView.m
@@ -1088,9 +1088,19 @@ static NSMapTable *viewInfo = 0;
 	[_attachedMenu indexOfItemWithSubmenu: aSubmenu]] toView: nil];
       NSPoint subOrigin = [_window convertBaseToScreen: aRect.origin];
 
-      /*We add +1 for don't lose the track when the user move the
-	mouse from the horizontal menu to a submenu.*/
-      return NSMakePoint(subOrigin.x, subOrigin.y - NSHeight(submenuFrame) + 1);
+      /* If menu is in window, we add +1 for don't lose the track when
+	 the user move the mouse from the horizontal menu to a submenu.*/
+      if (NSInterfaceStyleForKey(@"NSMenuInterfaceStyle", nil) ==
+	  NSWindows95InterfaceStyle)
+	{
+	  return NSMakePoint(subOrigin.x,
+			     subOrigin.y - NSHeight(submenuFrame) + 1);
+	}
+      else
+	{
+	  return NSMakePoint(subOrigin.x,
+			     subOrigin.y - NSHeight(submenuFrame));
+	}
     }
 }