diff --git a/ChangeLog b/ChangeLog
index 3028a655b..541acb258 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2007-01-23  Matt Rice  <ratmice@gmail.com>
+
+	* Source/NSWindow.m (-_lossOfKeyOrMainWindow): Use GSOrderedWindows.
+
 2007-01-19  Sergii Stoian <stoyan255@gmail.com>
 
 	* Source/GSTheme.m (-drawButton:view:style:state:): Call 
diff --git a/Source/NSWindow.m b/Source/NSWindow.m
index 37470d96c..7cc5053bb 100644
--- a/Source/NSWindow.m
+++ b/Source/NSWindow.m
@@ -231,14 +231,10 @@ has blocked and waited for events.
    key/main and skip the main menu window (which is the only
    non-obvious window that can become key) unless we have no choice
    (i.e. all the candidate windows were ordered out.)
-
-   FIXME: It would really be better if we maintained a stack of the
-   most recent key/main windows and went through in order of most
-   recent to least recent. That's probably a lot of work, however.
 */
 - (void) _lossOfKeyOrMainWindow
 {
-  NSArray	*windowList = GSAllWindows();
+  NSArray	*windowList = GSOrderedWindows();
   unsigned	pos = [windowList indexOfObjectIdenticalTo: self];
   unsigned	c = [windowList count];
   unsigned	i;