diff --git a/app/src/processing/app/Mode.java b/app/src/processing/app/Mode.java
index c7ceb1e2e..52ff24192 100644
--- a/app/src/processing/app/Mode.java
+++ b/app/src/processing/app/Mode.java
@@ -691,11 +691,18 @@ public abstract class Mode {
 
   /** Sketchbook has changed, update it on next viewing. */
   public void rebuildSketchbookFrame() {
-    boolean wasVisible =
-      (sketchbookFrame == null) ? false : sketchbookFrame.isVisible();
-    sketchbookFrame = null;  // Force a rebuild
-    if (wasVisible) {
-      showSketchbookFrame();
+    if (sketchbookFrame != null) {
+      boolean visible = sketchbookFrame.isVisible();
+      Rectangle bounds = null;
+      if (visible) {
+        bounds = sketchbookFrame.getBounds();
+        sketchbookFrame.setVisible(false);
+      }
+      sketchbookFrame = null;
+      if (visible) {
+        showSketchbookFrame();
+        sketchbookFrame.setBounds(bounds);
+      }
     }
   }