diff --git a/direct/src/showbase/ShowBase.py b/direct/src/showbase/ShowBase.py
index 1e9b407ed5..0a43953736 100644
--- a/direct/src/showbase/ShowBase.py
+++ b/direct/src/showbase/ShowBase.py
@@ -179,10 +179,10 @@ class ShowBase:
         """
         try:
             # Temporary try .. except for new window code
+            self.graphicsEngine.removeAllWindows()
+        except:
             for win in self.winList:
                 win.closeWindow()
-        except:
-            pass
         del self.win
         del self.winList
         del self.pipe
@@ -221,6 +221,7 @@ class ShowBase:
             pass
 
         self.getCameras(chanConfig)
+        return win
 
 
     def setupRender(self):
diff --git a/direct/src/showbase/showBase.cxx b/direct/src/showbase/showBase.cxx
index fcac8bb90e..3d44f8424b 100644
--- a/direct/src/showbase/showBase.cxx
+++ b/direct/src/showbase/showBase.cxx
@@ -28,7 +28,7 @@
 // Don't define this unless you have drose's new GraphicsWindow code,
 // which is currently a work in progress.  You probably won't have it
 // unless you are drose.
-//#define NEW_WINDOW_CODE
+#define NEW_WINDOW_CODE 1
 
 #ifdef NEW_WINDOW_CODE
 #include "graphicsPipeSelection.h"