diff --git a/basis/tools/deploy/shaker/shaker.factor b/basis/tools/deploy/shaker/shaker.factor
index 395da87726..9fc758dd4e 100755
--- a/basis/tools/deploy/shaker/shaker.factor
+++ b/basis/tools/deploy/shaker/shaker.factor
@@ -21,6 +21,13 @@ IN: tools.deploy.shaker
         command-line set-global
     ] "command-line" startup-hooks get set-at ;
 
+: set-stop-after-last-window? ( -- )
+    get-namestack [ "stop-after-last-window?" swap key? ] any? [
+        "ui-stop-after-last-window?" "ui.backend" lookup-word [
+            "stop-after-last-window?" get swap set-global
+        ] when*
+    ] when ;
+
 : strip-startup-hooks ( -- )
     "Stripping startup hooks" show
     {
@@ -632,6 +639,7 @@ SYMBOL: deploy-vocab
                     "Vocabulary has no MAIN: word." print flush 1 exit
                 ] unless
             ] tri
+            set-stop-after-last-window?
             strip
             "Saving final image" show
             save-image-and-exit
diff --git a/basis/ui/backend/backend.factor b/basis/ui/backend/backend.factor
index 66e53746c2..c8e55228f3 100644
--- a/basis/ui/backend/backend.factor
+++ b/basis/ui/backend/backend.factor
@@ -6,7 +6,7 @@ IN: ui.backend
 SYMBOL: ui-backend
 
 SYMBOL: ui-stop-after-last-window?
-ui-stop-after-last-window? [ t ] initialize
+t ui-stop-after-last-window? set-global
 
 HOOK: set-title ui-backend ( string world -- )