diff --git a/lib/git.zsh b/lib/git.zsh
index 52477baf6..a18b6d725 100644
--- a/lib/git.zsh
+++ b/lib/git.zsh
@@ -60,33 +60,35 @@ function git_prompt_long_sha() {
 git_prompt_status() {
   INDEX=$(git status --porcelain 2> /dev/null)
   STATUS=""
-  if $(echo "$INDEX" | grep '^?? ' &> /dev/null); then
+  if echo "$INDEX" | grep '^?? ' &> /dev/null; then
     STATUS="$ZSH_THEME_GIT_PROMPT_UNTRACKED$STATUS"
   fi
-  if $(echo "$INDEX" | grep '^A  ' &> /dev/null); then
+  if echo "$INDEX" | grep '^A  ' &> /dev/null; then
     STATUS="$ZSH_THEME_GIT_PROMPT_ADDED$STATUS"
-  elif $(echo "$INDEX" | grep '^M  ' &> /dev/null); then
+  elif echo "$INDEX" | grep '^M  ' &> /dev/null; then
     STATUS="$ZSH_THEME_GIT_PROMPT_ADDED$STATUS"
   fi
-  if $(echo "$INDEX" | grep '^ M ' &> /dev/null); then
+  if echo "$INDEX" | grep '^ M ' &> /dev/null; then
     STATUS="$ZSH_THEME_GIT_PROMPT_MODIFIED$STATUS"
-  elif $(echo "$INDEX" | grep '^AM ' &> /dev/null); then
+  elif echo "$INDEX" | grep '^AM ' &> /dev/null; then
     STATUS="$ZSH_THEME_GIT_PROMPT_MODIFIED$STATUS"
-  elif $(echo "$INDEX" | grep '^ T ' &> /dev/null); then
+  elif echo "$INDEX" | grep '^ T ' &> /dev/null; then
     STATUS="$ZSH_THEME_GIT_PROMPT_MODIFIED$STATUS"
   fi
-  if $(echo "$INDEX" | grep '^R  ' &> /dev/null); then
+  if echo "$INDEX" | grep '^R  ' &> /dev/null; then
     STATUS="$ZSH_THEME_GIT_PROMPT_RENAMED$STATUS"
   fi
-  if $(echo "$INDEX" | grep '^ D ' &> /dev/null); then
+  if echo "$INDEX" | grep '^ D ' &> /dev/null; then
     STATUS="$ZSH_THEME_GIT_PROMPT_DELETED$STATUS"
-  elif $(echo "$INDEX" | grep '^AD ' &> /dev/null); then
+  elif echo "$INDEX" | grep '^AD ' &> /dev/null; then
     STATUS="$ZSH_THEME_GIT_PROMPT_DELETED$STATUS"
   fi
-  if $(echo "$INDEX" | grep '^UU ' &> /dev/null); then
+  if echo "$INDEX" | grep '^UU ' &> /dev/null; then
     STATUS="$ZSH_THEME_GIT_PROMPT_UNMERGED$STATUS"
   fi
-  echo $STATUS
+  if [ "$STATUS" != "" ];then
+	  echo $STATUS
+  fi
 }
 
 #compare the provided version of git to the version installed and on path