diff --git a/js/kiri.js b/js/kiri.js
index f7e2618b..6cfa154b 100644
--- a/js/kiri.js
+++ b/js/kiri.js
@@ -1587,6 +1587,7 @@ self.kiri.license = exports.LICENSE;
         var layout = (viewMode === VIEWS.ARRANGE),
             proc = settings.process,
             modified = false,
+            oldmode = viewMode,
             topZ = MODE === MODES.CAM ? camTopZ : 0;
 
         switch (MODE) {
@@ -1602,6 +1603,12 @@ self.kiri.license = exports.LICENSE;
         setViewMode(VIEWS.ARRANGE);
         hideSlices();
 
+        // only auto-layout when in arrange mode
+        if (oldmode !== VIEWS.ARRANGE) {
+            SPACE.update();
+            return;
+        }
+
         // do not layout when switching back from slice view
         if (!space && !layout) return SPACE.update();