diff --git a/modules/git/alias.zsh b/modules/git/alias.zsh
index 7f6cf250..4e47ea9d 100644
--- a/modules/git/alias.zsh
+++ b/modules/git/alias.zsh
@@ -5,6 +5,19 @@
 #   Sorin Ionescu <sorin.ionescu@gmail.com>
 #
 
+#
+# Settings
+#
+#
+
+# Status
+zstyle -s ':prezto:module:git:status:ignore' submodules '_git_status_ignore_submodules' \
+  || _git_status_ignore_submodules='none'
+
+#
+# Aliases
+#
+
 # Git
 alias g='git'
 
@@ -151,8 +164,8 @@ alias gSu='git submodule foreach git pull origin master'
 alias gSx='git-submodule-remove'
 
 # Working Copy (w)
-alias gws='git status --short'
-alias gwS='git status'
+alias gws='git status --ignore-submodules=${_git_status_ignore_submodules} --short'
+alias gwS='git status --ignore-submodules=${_git_status_ignore_submodules}'
 alias gwd='git diff --no-ext-diff'
 alias gwD='git diff --no-ext-diff --word-diff'
 alias gwr='git reset --soft'
diff --git a/modules/git/functions/git-info b/modules/git/functions/git-info
index 6c7a1f68..5cf88d72 100644
--- a/modules/git/functions/git-info
+++ b/modules/git/functions/git-info
@@ -192,7 +192,7 @@ function git-info {
   local dirty=0
   local dirty_format
   local dirty_formatted
-  local ignore_submodule
+  local ignore_submodules
   local -A info_formats
   local info_format
   local line_number=0
@@ -258,9 +258,9 @@ function git-info {
   ahead_and_behind_cmd='git rev-list --count --left-right HEAD...@{upstream}'
 
   # Ignore submodule status.
-  zstyle -s ':prezto:module:git:ignore' submodule 'ignore_submodule'
-  if [[ -n "$ignore_submodule" ]]; then
-    status_cmd+=" --ignore-submodules=${ignore_submodule}"
+  zstyle -s ':prezto:module:git:status:ignore' submodules 'ignore_submodules'
+  if [[ -n "$ignore_submodules" ]]; then
+    status_cmd+=" --ignore-submodules=${ignore_submodules}"
   fi
 
   # Format commit.
diff --git a/runcoms/zpreztorc b/runcoms/zpreztorc
index fd17969e..27aad49b 100644
--- a/runcoms/zpreztorc
+++ b/runcoms/zpreztorc
@@ -49,7 +49,7 @@ zstyle ':prezto:module:editor' keymap 'emacs'
 #
 
 # Ignore submodules when they are 'dirty', 'untracked', 'all', or 'none'.
-# zstyle ':prezto:module:git:ignore' submodule 'all'
+# zstyle ':prezto:module:git:status:ignore' submodules 'all'
 
 #
 # GNU Utility