diff --git a/java/org/gnu/emacs/EmacsWindowManager.java b/java/org/gnu/emacs/EmacsWindowManager.java
index fb4ef6344b2..21df77587b0 100644
--- a/java/org/gnu/emacs/EmacsWindowManager.java
+++ b/java/org/gnu/emacs/EmacsWindowManager.java
@@ -246,8 +246,8 @@ public final class EmacsWindowManager
 	consumer.destroy ();
       }
 
-    pruneWindows ();
     windows.remove (window);
+    pruneWindows ();
   }
 
   public void