diff --git a/forgit.plugin.fish b/forgit.plugin.fish
index ffb08b8..8fe7a30 100755
--- a/forgit.plugin.fish
+++ b/forgit.plugin.fish
@@ -77,10 +77,7 @@ end
 function forgit::add 
     forgit::inside_work_tree || return 1
     # Add files if passed as arguments
-    if not count $argv > /dev/null
-        git add $argv
-        return
-    end
+    count $argv >/dev/null && git add "$argv" && return
 
     set changed (git config --get-color color.status.changed red)
     set unmerged (git config --get-color color.status.unmerged red)
diff --git a/forgit.plugin.zsh b/forgit.plugin.zsh
index 864e6ad..ec729ec 100755
--- a/forgit.plugin.zsh
+++ b/forgit.plugin.zsh
@@ -51,13 +51,10 @@ forgit::diff() {
 # git add selector
 forgit::add() {
     forgit::inside_work_tree || return 1
-    local changed unmerged untracked files opts
     # Add files if passed as arguments
-    [[ $# -ne 0 ]] && {
-        git add $@
-        return
-    }
+    [[ $# -ne 0 ]] && git add "$@" && return
 
+    local changed unmerged untracked files opts
     changed=$(git config --get-color color.status.changed red)
     unmerged=$(git config --get-color color.status.unmerged red)
     untracked=$(git config --get-color color.status.untracked red)