diff --git a/.config/fish/functions/kak-session.fish b/.config/fish/functions/kak-session.fish
index 424307a5..4fb20338 100644
--- a/.config/fish/functions/kak-session.fish
+++ b/.config/fish/functions/kak-session.fish
@@ -86,9 +86,9 @@ function kak-session -w kak --description "kakoune where sessions are derived fr
                 cat $fifo >/dev/null
 
                 command rm -r "$fifo_dir"
-                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
+                # echo "hook -once global BufCreate ^(?!.*\\*scratch\\*).* %{ delete-buffer *scratch*  }" | kak -p "$session_id"
+                # command kak -c "$session_id" -e 'delete-buffer! *scratch*' $flags $files
+                command kak -c "$session_id" -e 'try %{ delete-buffer *scratch*; bar-buflist; echo }' $flags $files
             else
                 command kak -s "$session_id" -e "cd %[$kakroot]" $flags $files
             end
@@ -118,9 +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"
-                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
+                # echo "hook -once global BufCreate [*]scratch[*] %{ delete-buffer *scratch*  }" | kak -p "$session_id"
+                # command kak -c "$session_id" -e 'delete-buffer! *scratch*' $flags $files
+                command kak -c "$session_id" -e 'try %{ delete-buffer *scratch*; bar-buflist; echo }' $flags $files
             else
                 command kak -s "$session_id" -e "cd %[$git_dir]" $flags $files
             end
diff --git a/.config/kak/kakrc b/.config/kak/kakrc
index 6c3f3cdc..6c927c07 100644
--- a/.config/kak/kakrc
+++ b/.config/kak/kakrc
@@ -185,3 +185,18 @@ define-command -docstring 'open popup shell' popup-shell %{
 alias global pp popup-shell
 
 map -docstring 'popup shell' global user . ': popup-shell<ret>'
+
+# hook -once global ClientCreate .* %{
+#     evaluate-commands %sh{
+#         if [ "$kak_buflist" != "*debug* *scratch*" ]; then
+#             echo "delete-buffer *scratch*"
+#         else
+#             echo "echo -debug dumping buffers"
+#             echo "echo -debug %val{buflist}"
+#         fi
+#     }
+# }
+
+hook -once global BufCreate ^(?!(\*scratch\*|\*debug\*)) %{
+    delete-buffer *scratch*
+}