diff --git a/src/components/structures/MatrixChat.js b/src/components/structures/MatrixChat.js
index 86614782fa..84a91896c5 100644
--- a/src/components/structures/MatrixChat.js
+++ b/src/components/structures/MatrixChat.js
@@ -1025,6 +1025,7 @@ module.exports = React.createClass({
 
     onUserSettingsClose: function() {
         // XXX: use browser history instead to find the previous room?
+        // or maintain a this.state.pageHistory in _setPage()?
         if (this.state.currentRoom) {
             dis.dispatch({
                 action: 'view_room',
diff --git a/src/components/structures/UserSettings.js b/src/components/structures/UserSettings.js
index e6895df41d..0b6815980c 100644
--- a/src/components/structures/UserSettings.js
+++ b/src/components/structures/UserSettings.js
@@ -340,7 +340,7 @@ module.exports = React.createClass({
 
         return (
             <div className="mx_UserSettings">
-                <SimpleRoomHeader title="Settings"/>
+                <SimpleRoomHeader title="Settings" onCancelClick={ this.props.onClose }/>
 
                 <GeminiScrollbar className="mx_UserSettings_body" autoshow={true}>
 
diff --git a/src/components/views/rooms/SimpleRoomHeader.js b/src/components/views/rooms/SimpleRoomHeader.js
index 8388da4a71..2f8c5eaf11 100644
--- a/src/components/views/rooms/SimpleRoomHeader.js
+++ b/src/components/views/rooms/SimpleRoomHeader.js
@@ -27,14 +27,21 @@ module.exports = React.createClass({
 
     propTypes: {
         title: React.PropTypes.string,
+        onCancelClick: React.PropTypes.func,
     },
 
     render: function() {
+        var cancelButton;
+        if (this.props.onCancelClick) {
+            cancelButton = <div className="mx_RoomHeader_cancelButton" onClick={this.props.onCancelClick}><img src="img/cancel.svg" width="18" height="18" alt="Cancel"/> </div>
+        }
+
         return (
             <div className="mx_RoomHeader" >
                 <div className="mx_RoomHeader_wrapper">
                     <div className="mx_RoomHeader_simpleHeader">
                         { this.props.title }
+                        { cancelButton }
                     </div>
                 </div>
             </div>