diff --git a/src/components/views/dialogs/ChatInviteDialog.js b/src/components/views/dialogs/ChatInviteDialog.js
index 7f04986b6b..884b6dc79e 100644
--- a/src/components/views/dialogs/ChatInviteDialog.js
+++ b/src/components/views/dialogs/ChatInviteDialog.js
@@ -108,16 +108,16 @@ module.exports = React.createClass({
         } else if (e.keyCode === 38) { // up arrow
             e.stopPropagation();
             e.preventDefault();
-            this.addressSelector.onKeyUpArrow();
+            this.addressSelector.onKeyU();
         } else if (e.keyCode === 40) { // down arrow
             e.stopPropagation();
             e.preventDefault();
-            this.addressSelector.onKeyDownArrow();
-        } else if (e.keyCode === 13) { // enter
+            this.addressSelector.onKeyDown();
+        } else if (e.keyCode === 13 || (e.keyCode === 9 && this.state.queryList.length > 0)) { // enter or tab
             e.stopPropagation();
             e.preventDefault();
-            this.addressSelector.onKeyReturn();
-        } else if (e.keyCode === 32 || e.keyCode === 188) { // space or comma
+            this.addressSelector.onKeySelect();
+        } else if (e.keyCode === 32 || e.keyCode === 188 || e.keyCode === 9) { // space, comma or tab
             e.stopPropagation();
             e.preventDefault();
             var check = Invite.isValidAddress(this.refs.textinput.value);
diff --git a/src/components/views/elements/AddressSelector.js b/src/components/views/elements/AddressSelector.js
index 204e08404e..2c2d7e2d61 100644
--- a/src/components/views/elements/AddressSelector.js
+++ b/src/components/views/elements/AddressSelector.js
@@ -55,7 +55,7 @@ module.exports = React.createClass({
         }
     },
 
-    onKeyUpArrow: function() {
+    onKeyUp: function() {
         if (this.state.selected > 0) {
             this.setState({
                 selected: this.state.selected - 1,
@@ -64,7 +64,7 @@ module.exports = React.createClass({
         }
     },
 
-    onKeyDownArrow: function() {
+    onKeyDown: function() {
         if (this.state.selected < this._maxSelected(this.props.addressList)) {
             this.setState({
                 selected: this.state.selected + 1,
@@ -73,7 +73,7 @@ module.exports = React.createClass({
         }
     },
 
-    onKeyReturn: function() {
+    onKeySelect: function() {
         this.selectAddress(this.state.selected);
     },