diff --git a/gitprompt.sh b/gitprompt.sh
index 8d6045f..de42263 100755
--- a/gitprompt.sh
+++ b/gitprompt.sh
@@ -519,10 +519,8 @@ function updatePrompt() {
         v="\$GIT_$1 $2"
       fi
       if eval "test $v" ; then
-        if [[ $# -lt 2 || "$3" != '-' ]] && [[ "x$1" == "xREMOTE" ]]; then
+        if [[ $# -lt 2 || "$3" != '-' ]] && [[ "x$1" == "xREMOTE" || "${__GIT_PROMPT_SHOW_CHANGED_FILES_COUNT}" -eq "1" ]]; then
            __add_status "\$GIT_PROMPT_$1\$GIT_$1\$ResetColor"
-        elif [[ $# -lt 2 || "$3" != '-' ]] && [[ "${__GIT_PROMPT_SHOW_CHANGED_FILES_COUNT}" -eq "1" ]]; then
-          __add_status "\$GIT_PROMPT_$1\$GIT_$1\$ResetColor"
         else
           __add_status "\$GIT_PROMPT_$1\$ResetColor"
         fi