diff --git a/lib/key-bindings.zsh b/lib/key-bindings.zsh
index 9c2dda35..5c1b90bf 100644
--- a/lib/key-bindings.zsh
+++ b/lib/key-bindings.zsh
@@ -14,10 +14,15 @@ bindkey '^[[B' down-line-or-search
 
 bindkey "^[[H" beginning-of-line
 bindkey "^[[1~" beginning-of-line
+bindkey "^[OH" beginning-of-line
 bindkey "^[[F"  end-of-line
 bindkey "^[[4~" end-of-line
+bindkey "^[OF" end-of-line
 bindkey ' ' magic-space    # also do history expansion on space
 
+bindkey "^[[1;5C" forward-word
+bindkey "^[[1;5D" backward-word
+
 bindkey '^[[Z' reverse-menu-complete
 
 # Make the delete key (or Fn + Delete on the Mac) work instead of outputting a ~