diff --git a/src/components/views/elements/MessageEditor.js b/src/components/views/elements/MessageEditor.js
index ed86bcb0a3..98569023cb 100644
--- a/src/components/views/elements/MessageEditor.js
+++ b/src/components/views/elements/MessageEditor.js
@@ -116,6 +116,10 @@ export default class MessageEditor extends React.Component {
                     autoComplete.onUpArrow(event); break;
                 case "ArrowDown":
                     autoComplete.onDownArrow(event); break;
+                case "ArrowLeft":
+                    autoComplete.onLeftArrow(event); break;
+                case "ArrowRight":
+                    autoComplete.onRightArrow(event); break;
                 case "Tab":
                     autoComplete.onTab(event); break;
                 case "Escape":
diff --git a/src/editor/autocomplete.js b/src/editor/autocomplete.js
index ba18207de1..c0dc020897 100644
--- a/src/editor/autocomplete.js
+++ b/src/editor/autocomplete.js
@@ -55,6 +55,22 @@ export default class AutocompleteWrapperModel {
         });
     }
 
+    onUpArrow() {
+        this._getAutocompleterComponent().moveSelection(-1);
+    }
+
+    onDownArrow() {
+        this._getAutocompleterComponent().moveSelection(+1);
+    }
+
+    onLeftArrow() {
+        this._getAutocompleterComponent().moveSelection(-1);
+    }
+
+    onRightArrow() {
+        this._getAutocompleterComponent().moveSelection(+1);
+    }
+
     onPartUpdate(part, offset) {
         // cache the typed value and caret here
         // so we can restore it in onComponentSelectionChange when the value is undefined (meaning it should be the typed text)