diff --git a/src/components/views/dialogs/CreateRoomDialog.js b/src/components/views/dialogs/CreateRoomDialog.js
index e3070cfef3..8e267da5d1 100644
--- a/src/components/views/dialogs/CreateRoomDialog.js
+++ b/src/components/views/dialogs/CreateRoomDialog.js
@@ -65,6 +65,8 @@ export default createReactClass({
 
     componentDidMount() {
         this._detailsRef.addEventListener("toggle", this.onDetailsToggled);
+        // move focus to first field when showing dialog
+        this._nameFieldRef.focus();
     },
 
     componentWillUnmount() {