diff --git a/lib/git.zsh b/lib/git.zsh
index fb4ad8ca6..410948309 100644
--- a/lib/git.zsh
+++ b/lib/git.zsh
@@ -1,7 +1,7 @@
 # get the name of the branch we are on
 function git_prompt_info() {
   ref=$(git symbolic-ref HEAD 2> /dev/null) || return
-  echo "$ZSH_THEME_GIT_PROMPT_PREFIX${ref#refs/heads/}$(parse_git_dirty)$ZSH_THEME_GIT_PROMPT_SUFFIX"
+  echo "$ZSH_THEME_GIT_PROMPT_PREFIX${ref#refs/heads/}$(parse_git_dirty)$(parse_git_stash)$ZSH_THEME_GIT_PROMPT_SUFFIX"
 }
 
 
@@ -18,6 +18,14 @@ parse_git_dirty() {
   fi
 }
 
+# Checks if working tree contains stash(es)
+parse_git_stash() {
+  if [[ -n $(git stash list 2> /dev/null) ]]; then
+    echo "$ZSH_THEME_GIT_PROMPT_HAVE_STASH"
+  else
+    echo "$ZSH_THEME_GIT_PROMPT_HAVE_NO_STASH"
+  fi
+}
 
 # Checks if there are commits ahead from remote
 function git_prompt_ahead() {