diff --git a/themes/robbyrussell/fish_prompt.fish b/themes/robbyrussell/fish_prompt.fish
index 1bf0c61..735de13 100644
--- a/themes/robbyrussell/fish_prompt.fish
+++ b/themes/robbyrussell/fish_prompt.fish
@@ -1,10 +1,19 @@
 # name: RobbyRussel
+#
+# You can override some default options in your config.fish:
+#   set -g theme_display_git_untracked no
+
 function _git_branch_name
   echo (command git symbolic-ref HEAD ^/dev/null | sed -e 's|^refs/heads/||')
 end
 
 function _is_git_dirty
-  echo (command git status -s --ignore-submodules=dirty ^/dev/null)
+  set -l show_untracked (git config --bool bash.showUntrackedFiles)
+  set untracked ''
+  if [ "$theme_display_git_untracked" = 'no' -o "$show_untracked" = 'false' ]
+    set untracked '--untracked-files=no'
+  end
+  echo (command git status -s --ignore-submodules=dirty $untracked ^/dev/null)
 end
 
 function fish_prompt
@@ -33,6 +42,6 @@ function fish_prompt
     end
   end
 
-  echo -n -s $arrow $cwd $git_info $normal ' '
+  echo -n -s $arrow ' ' $cwd $git_info $normal ' '
 end