diff --git a/lib/ace/keyboard/keybinding/vim.js b/lib/ace/keyboard/keybinding/vim.js
index abe537f7..f3036cb3 100644
--- a/lib/ace/keyboard/keybinding/vim.js
+++ b/lib/ace/keyboard/keybinding/vim.js
@@ -46,6 +46,16 @@ var vimStates = {
             key:    "i",
             then:   "insertMode"
         },
+        {
+            key:    "o",
+            exec:   "gotoright",
+            then:   "insertMode"
+        },
+        {
+            key:    "shift-r",
+            exec:   "overwrite",
+            then:   "replaceMode"
+        },
         {
             regex:  [ "([0-9]*)", "(k|up)" ],
             exec:   "golineup",
@@ -104,6 +114,13 @@ var vimStates = {
             key:      "esc",
             then:     "start"
         }
+    ],
+    replaceMode: [
+        {
+            key:      "esc",
+            exec:     "overwrite",
+            then:     "start"
+        }
     ]
 };