diff --git a/modules/environment/init.zsh b/modules/environment/init.zsh
index 7ae8c4f6a65..b01a7ad5936 100644
--- a/modules/environment/init.zsh
+++ b/modules/environment/init.zsh
@@ -38,6 +38,9 @@ setopt INTERACTIVE_COMMENTS # Enable comments in interactive shell.
 setopt RC_QUOTES            # Allow 'Henry''s Garage' instead of 'Henry'\''s Garage'.
 unsetopt MAIL_WARNING       # Don't print a warning message if a mail file has been accessed.
 
+# Allow mapping Ctrl+S and Ctrl+Q shortcuts
+(( $+commands[stty] )) && stty -ixon
+
 #
 # Jobs
 #