diff --git a/src/components/structures/RoomView.js b/src/components/structures/RoomView.js
index e9e46a2ff6..32121d6de5 100644
--- a/src/components/structures/RoomView.js
+++ b/src/components/structures/RoomView.js
@@ -195,6 +195,8 @@ module.exports = React.createClass({
             editingRoomSettings: RoomViewStore.isEditingSettings(),
         };
 
+        if (this.state.editingRoomSettings && !newState.editingRoomSettings) dis.dispatch({action: 'focus_composer'});
+
         // Temporary logging to diagnose https://github.com/vector-im/riot-web/issues/4307
         console.log(
             'RVS update:',