diff --git a/.config/fish/functions/kakrc.fish b/.config/fish/functions/kakrc.fish
index 58c1b67c..1a658ad8 100644
--- a/.config/fish/functions/kakrc.fish
+++ b/.config/fish/functions/kakrc.fish
@@ -1,9 +1,5 @@
 function kakrc --description "Edit kakrc"
-    # if test "$argv[1]" != -c || test "$argv[1]" != new
-    #     kak-session -nokakdaemon ~/.config/kak/kakrc
-    # else
-    #     kak -e 'cd ~/.config/kak' ~/.config/kak/kakrc
-    # end
-    kak -e 'cd ~/.config/kak' ~/.config/kak/kakrc -s kakrc
-
+    if not kak -e 'cd ~/.config/kak' ~/.config/kak/kakrc -s kakrc 2>/dev/null
+        kak -c kakrc
+    end
 end