diff --git a/.config/fish/functions/kak-session.fish b/.config/fish/functions/kak-session.fish
index 6354a948..424307a5 100644
--- a/.config/fish/functions/kak-session.fish
+++ b/.config/fish/functions/kak-session.fish
@@ -86,7 +86,9 @@ function kak-session -w kak --description "kakoune where sessions are derived fr
                 cat $fifo >/dev/null
 
                 command rm -r "$fifo_dir"
-                command kak -c "$session_id" -e 'try %{ delete-buffer *scratch*; bar-buflist; echo }' $flags $files
+                echo "hook -once global BufCreate ^(?!.*\\*scratch\\*).* %{ delete-buffer *scratch*  }" | kak -p "$session_id"
+                command kak -c "$session_id" -e 'delete-buffer *scratch*; bar-buflist; echo' $flags $files
+                # command kak -c "$session_id" -e 'try %{ delete-buffer *scratch*; bar-buflist; echo } catch %{ nop %sh{notify-send "error"} }' $flags $files
             else
                 command kak -s "$session_id" -e "cd %[$kakroot]" $flags $files
             end
@@ -116,7 +118,9 @@ function kak-session -w kak --description "kakoune where sessions are derived fr
                 setsid kak -d -s "$session_id" -E "cd %[$git_dir]; echo -to-file $fifo ready" &
                 cat $fifo >/dev/null
                 command rm -r "$fifo_dir"
-                command kak -c "$session_id" -e 'try %{ delete-buffer *scratch*; bar-buflist; echo }' $flags $files
+                echo "hook -once global BufCreate [*]scratch[*] %{ delete-buffer *scratch*  }" | kak -p "$session_id"
+                command kak -c "$session_id" -e 'delete-buffer *scratch*; bar-buflist; echo' $flags $files
+                # command kak -c "$session_id" -e 'try %{ delete-buffer *scratch*; bar-buflist; echo } catch %{ nop %sh{notify-send "error"} }' $flags $files
             else
                 command kak -s "$session_id" -e "cd %[$git_dir]" $flags $files
             end