diff --git a/extensions/vi-mode/binds.lisp b/extensions/vi-mode/binds.lisp
index 5bd50a528..1954f9eaf 100644
--- a/extensions/vi-mode/binds.lisp
+++ b/extensions/vi-mode/binds.lisp
@@ -156,7 +156,6 @@
 (define-key *insert-keymap* "C-w" 'vi-kill-last-word)
 (define-key *insert-keymap* "Shift-Up" 'previous-page)
 (define-key *insert-keymap* "Shift-Down" 'next-page)
-
 (define-key *insert-keymap* "Shift-Left" 'vi-backward-word-begin)
 (define-key *insert-keymap* "Shift-Right" 'vi-forward-word-begin)
 
diff --git a/extensions/vi-mode/commands.lisp b/extensions/vi-mode/commands.lisp
index 455b57931..4bef86c5a 100644
--- a/extensions/vi-mode/commands.lisp
+++ b/extensions/vi-mode/commands.lisp
@@ -116,7 +116,6 @@
            :vi-write
            :vi-quit
            :vi-write-quit
-           :vi-close
            :vi-end-insert
            :vi-insert
            :vi-insert-line
@@ -140,6 +139,7 @@
            :vi-repeat
            :vi-normal
            :vi-keyboard-quit
+           :vi-close
            :vi-window-move-left
            :vi-window-move-down
            :vi-window-move-up
diff --git a/extensions/vi-mode/ex-command.lisp b/extensions/vi-mode/ex-command.lisp
index b970db189..52fab719c 100644
--- a/extensions/vi-mode/ex-command.lisp
+++ b/extensions/vi-mode/ex-command.lisp
@@ -119,7 +119,8 @@
   (lem:exit-lem nil))
 
 (define-ex-command "^clo(?:se)?$" (range filename)
-  (lem-vi-mode/commands:vi-close nil))
+  (declare (ignore range filename))
+  (lem-vi-mode/commands:vi-close 1))
 
 (define-ex-command "^(x|xit)$" (range filename)
   (ex-write-quit range filename nil nil))
@@ -128,7 +129,8 @@
   (ex-write-quit range filename t nil))
 
 (define-ex-command "^on(?:ly)?$" (range filename)
-  (lem-vi-mode/commands:vi-quit nil))
+  (declare (ignore range filename))
+  (lem:delete-other-windows))
 
 (defun copy-current-jumplist-to-next-window ()
   (let* ((window-list