diff --git a/modules/fish/default.nix b/modules/fish/default.nix
index 4004835..c610526 100644
--- a/modules/fish/default.nix
+++ b/modules/fish/default.nix
@@ -52,15 +52,23 @@
         command fzf
       '';
       zellij_session_delete = ''
-        set -l session_name (basename $1)
+        if test -z "$argv[1]"
+          return
+        end
+
+        set -l session_name (basename $argv[1])
         echo "delete $session_name"
       '';
       zellij_session_kill = ''
-        set -l session_name (basename $1)
+        if test -z "$argv[1]"
+          return
+        end
+
+        set -l session_name (basename $argv[1])
         echo "delete $session_name"
       '';
       zellij_session_fzf = ''
-        fzf \
+        command fzf \
         --prompt="Select project: " \
         --header="Enter: Select | Ctrl+D: Delete Session | Ctrl+K: Kill Session" \
         --bind="ctrl-d:execute(zellij_session_delete {})+reload($0 --generate-list)" \