diff --git a/ChangeLog b/ChangeLog
index 00dc821d6..f59766839 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2003-03-07  Willem Rein Oudshoorn  <woudshoo@xs4all.nl>
+
+	* Source/NSMenu.m: ([-_updateUserDefaults:]) Do not store location
+	for attached menus.
+
 2003-03-07  Richard Frith-Macdonald <rfm@gnu.org>
 
 	* Source/NSMenu.m: ([-_updateUserDefaults:]) restore saved menu
diff --git a/Source/NSMenu.m b/Source/NSMenu.m
index 8c6faec1a..86e0a5a34 100644
--- a/Source/NSMenu.m
+++ b/Source/NSMenu.m
@@ -214,7 +214,8 @@ static NSNotificationCenter *nc;
       defaults = [NSUserDefaults standardUserDefaults];
       menuLocations = [[defaults objectForKey: NSMenuLocationsKey] mutableCopy];
 
-      if ([_aWindow isVisible])
+      if ([_aWindow isVisible]
+	&& ([self isTornOff] || ([NSApp mainWindow] == self)))
         {
           if (menuLocations == nil)
             {