diff --git a/src/rc/grep.kak b/src/rc/grep.kak
index 53e2c2df..67bd0f22 100644
--- a/src/rc/grep.kak
+++ b/src/rc/grep.kak
@@ -12,8 +12,7 @@ def -shell-params -file-completion \
 
      if [[ -n "$kak_opt_toolsclient" ]]; then echo "eval -client '$kak_opt_toolsclient' %{"; fi
 
-     echo "try %{ db *grep* } catch %{}
-           edit -fifo ${output} *grep*
+     echo "edit! -fifo ${output} *grep*
            setb filetype grep
            hook buffer BufClose .* %{ nop %sh{ rm -r $(dirname ${output}) } }"
 
diff --git a/src/rc/make.kak b/src/rc/make.kak
index 269ef10b..4d62906f 100644
--- a/src/rc/make.kak
+++ b/src/rc/make.kak
@@ -7,8 +7,7 @@ def -shell-params make %{ %sh{
 
      if [[ -n "$kak_opt_toolsclient" ]]; then echo "eval -client '$kak_opt_toolsclient' %{"; fi
 
-     echo "try %{ db *make* } catch %{}
-           edit -fifo ${output} *make*
+     echo "edit! -fifo ${output} *make*
            setb filetype make
            hook buffer BufClose .* %{ nop %sh{ rm -r $(dirname ${output}) } }"