diff --git a/src/components/structures/RoomView.js b/src/components/structures/RoomView.js
index 3749ee3bc6..a9c9651041 100644
--- a/src/components/structures/RoomView.js
+++ b/src/components/structures/RoomView.js
@@ -860,6 +860,8 @@ module.exports = React.createClass({
     },
 
     onSettingsSaveClick: function() {
+        if (!this.refs.room_settings) return;
+
         this.setState({
             uploadingRoomSettings: true,
         });
@@ -1432,6 +1434,7 @@ module.exports = React.createClass({
                 <RoomHeader ref="header" room={this.state.room} searchInfo={searchInfo}
                     oobData={this.props.oobData}
                     editing={this.state.editingRoomSettings}
+                    saving={this.state.uploadingRoomSettings}
                     onSearchClick={this.onSearchClick}
                     onSettingsClick={this.onSettingsClick}
                     onSaveClick={this.onSettingsSaveClick}
diff --git a/src/components/views/rooms/RoomHeader.js b/src/components/views/rooms/RoomHeader.js
index 3e237a8f95..9a60c6ad01 100644
--- a/src/components/views/rooms/RoomHeader.js
+++ b/src/components/views/rooms/RoomHeader.js
@@ -34,6 +34,7 @@ module.exports = React.createClass({
         room: React.PropTypes.object,
         oobData: React.PropTypes.object,
         editing: React.PropTypes.bool,
+        saving: React.PropTypes.bool,
         onSettingsClick: React.PropTypes.func,
         onSaveClick: React.PropTypes.func,
         onSearchClick: React.PropTypes.func,
@@ -134,6 +135,7 @@ module.exports = React.createClass({
         var searchStatus = null;
         var topic_el = null;
         var cancel_button = null;
+        var spinner = null;
         var save_button = null;
         var settings_button = null;
         if (this.props.editing) {
@@ -158,6 +160,11 @@ module.exports = React.createClass({
             cancel_button = <div className="mx_RoomHeader_cancelButton" onClick={this.props.onCancelClick}><img src="img/cancel.svg" width="18" height="18" alt="Cancel"/> </div>
         }
 
+        if (this.props.saving) {
+            var Spinner = sdk.getComponent("elements.Spinner");
+            spinner = <div className="mx_RoomHeader_spinner"><Spinner/></div>;
+        }
+
         if (can_set_room_name) {
             var RoomNameEditor = sdk.getComponent("rooms.RoomNameEditor");
             name = <RoomNameEditor ref="nameEditor" room={this.props.room} />
@@ -280,6 +287,7 @@ module.exports = React.createClass({
                         { topic_el }
                     </div>
                 </div>
+                {spinner}
                 {save_button}
                 {cancel_button}
                 {right_row}