2 files changed, 10 insertions, 0 deletions

diff --git a/src/w32fns.c b/src/w32fns.c
index 74aaf164bec..f3001649f81 100644
--- a/src/w32fns.c
+++ b/src/w32fns.c
@@ -5462,6 +5462,11 @@ This function is an internal primitive--use `make-frame' instead.")
         ;
     }
   UNGCPRO;
+  
+  /* Make sure windows on this frame appear in calls to next-window
+     and similar functions.  */
+  Vwindow_list = Qnil;
+  
   return unbind_to (count, frame);
 }
 
diff --git a/src/xfns.c b/src/xfns.c
index 8ed08ee75ff..97c57382f41 100644
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -4455,6 +4455,11 @@ This function is an internal primitive--use `make-frame' instead.")
     }
 
   UNGCPRO;
+
+  /* Make sure windows on this frame appear in calls to next-window
+     and similar functions.  */
+  Vwindow_list = Qnil;
+  
   return unbind_to (count, frame);
 }