diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1bbad3c..c7a1cda 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,11 @@ Ansible Role - ubuntu-base: Changelog
 =====================================
 A list of all the changes made to this repo and the role it contains
 
+Version 1.1.6
+-------------
+
+1. Adding a bindkey setting to make zsh behave a bit better when SSHing in from a Mac
+
 Version 1.1.5
 -------------
 
diff --git a/files/zshrc b/files/zshrc
index c6e4f70..3a23f7d 100644
--- a/files/zshrc
+++ b/files/zshrc
@@ -100,6 +100,7 @@ export SAVEHIST=5000
 export HISTFILE=~/.zsh_history
 
 # Custom key bindings
+bindkey -e
 bindkey '^R' history-incremental-search-backward
 
 # Set vim as the default editor