diff --git a/src/components/views/dialogs/SetMxIdDialog.js b/src/components/views/dialogs/SetMxIdDialog.js
index 19924093de..61acbf2192 100644
--- a/src/components/views/dialogs/SetMxIdDialog.js
+++ b/src/components/views/dialogs/SetMxIdDialog.js
@@ -91,6 +91,12 @@ export default React.createClass({
         });
     },
 
+    onKeyUp: function(ev) {
+        if (ev.keyCode === 13) {
+            this.onSubmit();
+        }
+    },
+
     onSubmit: function(ev) {
         this.setState({
             doingUIAuth: true,
@@ -233,7 +239,10 @@ export default React.createClass({
                 <div className="mx_Dialog_content">
                     <div className="mx_SetMxIdDialog_input_group">
                         <input type="text" ref="input_value" value={this.state.username}
-                            autoFocus={true} onChange={this.onValueChange} size="30"
+                            autoFocus={true}
+                            onChange={this.onValueChange}
+                            onKeyUp={this.onKeyUp}
+                            size="30"
                             className={inputClasses}
                         />
                         { usernameBusyIndicator }