diff --git a/skins/base/views/organisms/RoomView.js b/skins/base/views/organisms/RoomView.js
index aaed8776a2..20d073b990 100644
--- a/skins/base/views/organisms/RoomView.js
+++ b/skins/base/views/organisms/RoomView.js
@@ -75,7 +75,7 @@ module.exports = React.createClass({
                 <div className="mx_RoomView">
                     <RoomHeader room={this.state.room} />
                     <div className="mx_RoomView_roomWrapper">
-                        <div className="mx_RoomView_messagePanel">
+                        <main className="mx_RoomView_messagePanel">
                             <div ref="messageWrapper" className="mx_RoomView_messageListWrapper" onScroll={this.onMessageListScroll}>
                                 <div className="mx_RoomView_MessageList">
                                     <div className={scrollheader_classes}>
@@ -86,8 +86,10 @@ module.exports = React.createClass({
                                 </div>
                             </div>
                             <MessageComposer roomId={this.props.roomId} />
-                        </div>
-                        <MemberList roomId={this.props.roomId} key={this.props.roomId} />
+                        </main>
+                        <aside>
+                            <MemberList roomId={this.props.roomId} key={this.props.roomId} />
+                        </aside>
                     </div>
                 </div>
             );
diff --git a/skins/base/views/pages/MatrixChat.js b/skins/base/views/pages/MatrixChat.js
index 0231af4420..be4cd43417 100644
--- a/skins/base/views/pages/MatrixChat.js
+++ b/skins/base/views/pages/MatrixChat.js
@@ -40,10 +40,10 @@ module.exports = React.createClass({
             return (
                 <div className="mx_MatrixChat">
                     <div className="mx_MatrixChat_chatWrapper">
-                        <div className="mx_MatrixChat_leftPanel">
+                        <aside className="mx_MatrixChat_leftPanel">
                             <RoomList selectedRoom={this.state.currentRoom} />
                             <MatrixToolbar />
-                        </div>
+                        </aside>
                         <RoomView roomId={this.state.currentRoom} key={this.state.currentRoom} />
                     </div>
                 </div>