diff --git a/skins/base/css/organisms/RoomView.css b/skins/base/css/organisms/RoomView.css
index 253eaa0d76..92cc87ba10 100644
--- a/skins/base/css/organisms/RoomView.css
+++ b/skins/base/css/organisms/RoomView.css
@@ -94,6 +94,19 @@ limitations under the License.
 }
 
 .mx_RoomView_invitePrompt {
+    -webkit-box-ordinal-group: 2;
+    -moz-box-ordinal-group: 2;
+    -ms-flex-order: 2;
+    -webkit-order: 2;
+    order: 2;
+
+    min-width: 0px;
+    max-width: 720px;
+    width: 100%;
+    margin: auto;
+
+    margin-top: 12px;
+    margin-bottom: 12px;
 }
 
 .mx_RoomView_statusArea {
diff --git a/skins/base/views/organisms/RoomView.js b/skins/base/views/organisms/RoomView.js
index 11ca840df2..9bcde890ea 100644
--- a/skins/base/views/organisms/RoomView.js
+++ b/skins/base/views/organisms/RoomView.js
@@ -92,8 +92,10 @@ module.exports = React.createClass({
                 var joinErrorText = this.state.joinError ? "Failed to join room!" : "";
                 return (
                     <div className="mx_RoomView">
+                        <RoomHeader ref="header" room={this.state.room} simpleHeader="Room invite"/>
                         <div className="mx_RoomView_invitePrompt">
                             <div>{inviteEvent.user_id} has invited you to a room</div>
+                            <br/>
                             <button ref="joinButton" onClick={this.onJoinButtonClicked}>Join</button>
                             <div className="error">{joinErrorText}</div>
                         </div>