diff --git a/extensions/vi-mode/jumplist.lisp b/extensions/vi-mode/jumplist.lisp
index d8c95a74e..b16dd5341 100644
--- a/extensions/vi-mode/jumplist.lisp
+++ b/extensions/vi-mode/jumplist.lisp
@@ -139,8 +139,8 @@
       (let ((jumplist (make-jumplist)))
         (setf (window-parameter window :vi-mode-jumplist)
               jumplist)
-        (push (lambda () (delete-jumplist jumplist))
-              (window-delete-hook window))
+        (add-hook (window-delete-hook window)
+                  (lambda () (delete-jumplist jumplist)))
         jumplist)))
 
 (defun (setf window-jumplist) (jumplist window)