diff --git a/themes/agnoster.zsh-theme b/themes/agnoster.zsh-theme
index 8c700d06a..2b1ea6d11 100644
--- a/themes/agnoster.zsh-theme
+++ b/themes/agnoster.zsh-theme
@@ -129,7 +129,11 @@ prompt_git() {
 
     zstyle ':vcs_info:*' enable git
     zstyle ':vcs_info:*' get-revision true
-    zstyle ':vcs_info:*' check-for-changes true
+    if [[ -z $dirty ]]; then
+      zstyle ':vcs_info:*' check-for-staged-changes true
+    else
+      zstyle ':vcs_info:*' check-for-changes true
+    fi
     zstyle ':vcs_info:*' stagedstr '✚'
     zstyle ':vcs_info:*' unstagedstr '●'
     zstyle ':vcs_info:*' formats ' %u%c'