diff --git a/rc/tools/grep.kak b/rc/tools/grep.kak
index 79931c0a7..13b5b9c30 100644
--- a/rc/tools/grep.kak
+++ b/rc/tools/grep.kak
@@ -54,11 +54,11 @@ define-command -hidden grep-jump %{
 }
 
 define-command grep-next-match -docstring %{alias for "jump-next *grep*"} %{
-    jump-next *grep*
+    jump-next -matching \*grep(-.*)?\*
 }
 
 define-command grep-previous-match -docstring %{alias for "jump-previous *grep*"} %{
-    jump-previous *grep*
+    jump-previous -matching \*grep(-.*)?\*
 }
 
 }
diff --git a/rc/tools/jump.kak b/rc/tools/jump.kak
index 51d0bca21..60d777d45 100644
--- a/rc/tools/jump.kak
+++ b/rc/tools/jump.kak
@@ -21,17 +21,17 @@ define-command -hidden jump %{
     }
 }
 
-define-command jump-next -params 1 -docstring %{
+define-command jump-next -params 1.. -docstring %{
     jump-next <bufname>: jump to next location listed in the given *grep*-like location list buffer.
 } %{
     evaluate-commands -try-client %opt{jumpclient} -save-regs / %{
-        buffer %arg{1}
+        buffer %arg{@}
         jump-select-next
         jump
     }
     try %{
         evaluate-commands -client %opt{toolsclient} %{
-            buffer %arg{1}
+            buffer %arg{@}
             execute-keys gg %opt{jump_current_line}g
         }
     }
@@ -44,17 +44,17 @@ define-command -hidden jump-select-next %{
     execute-keys ge %opt{jump_current_line}g<a-l> /^[^:\n]+:\d+:<ret>
 }
 
-define-command jump-previous -params 1 -docstring %{
+define-command jump-previous -params 1.. -docstring %{
     jump-previous <bufname>: jump to previous location listed in the given *grep*-like location list buffer.
 } %{
     evaluate-commands -try-client %opt{jumpclient} -save-regs / %{
-        buffer %arg{1}
+        buffer %arg{@}
         jump-select-previous
         jump
     }
     try %{
         evaluate-commands -client %opt{toolsclient} %{
-            buffer %arg{1}
+            buffer %arg{@}
             execute-keys gg %opt{jump_current_line}g
         }
     }