diff --git a/basis/command-line/command-line.factor b/basis/command-line/command-line.factor
index 71f87d8658..8f38208c89 100644
--- a/basis/command-line/command-line.factor
+++ b/basis/command-line/command-line.factor
@@ -62,19 +62,19 @@ SYMBOL: command-line
         [ source-file main>> [ execute( -- ) ] when* ] bi
     ] with-variable ;
 
-: run-script? ( rest first -- rest first ? )
-    over empty? not "run" get-global and ;
-
-: parse-command-line ( args -- )
-    [ command-line off script off ] [
+: (parse-command-line) ( run? args -- )
+    [ command-line off script off drop ] [
         unclip "-" ?head
-        [ param parse-command-line ]
+        [ param (parse-command-line) ]
         [
-            run-script? [ prefix f ] when
+            rot [ prefix f ] when
             script set command-line set
         ] if
     ] if-empty ;
 
+: parse-command-line ( args -- )
+    [ [ "-run=" head? ] any? ] keep (parse-command-line) ;
+
 SYMBOL: main-vocab-hook
 
 : main-vocab ( -- vocab )