diff --git a/rc/detection/file.kak b/rc/detection/file.kak
index 2c2f8781..c9b2a404 100644
--- a/rc/detection/file.kak
+++ b/rc/detection/file.kak
@@ -12,6 +12,7 @@ hook global BufOpenFile .* %{ evaluate-commands %sh{
             text/*)   filetype="${mime#text/}" ;;
             application/x-*) filetype="${mime#application/x-}" ;;
             application/*) filetype="${mime#application/}" ;;
+            *) exit ;;
         esac
         if [ -n "${filetype}" ]; then
             printf "set-option buffer filetype '%s'\n" "${filetype}"
diff --git a/rc/tools/git.kak b/rc/tools/git.kak
index fa705215..8511f7aa 100644
--- a/rc/tools/git.kak
+++ b/rc/tools/git.kak
@@ -78,6 +78,7 @@ define-command -params 1.. \
            diff) filetype=diff ;;
            log|show)  filetype=git-log ;;
            status)  filetype=git-status ;;
+           *) return 1 ;;
         esac
         output=$(mktemp -d "${TMPDIR:-/tmp}"/kak-git.XXXXXXXX)/fifo
         mkfifo ${output}