diff --git a/static/js/directives/chat.js b/static/js/directives/chat.js
index 0a880e49..3b6878c7 100644
--- a/static/js/directives/chat.js
+++ b/static/js/directives/chat.js
@@ -412,7 +412,10 @@ define(['underscore', 'text!partials/chat.html', 'text!partials/chatroom.html'],
                 };
 
                 scope.$watch("layout.chat", function(chat) {
-                    pane.removeClass("flip");
+                    if (!chat) {
+                        pane.removeClass("flip");
+                        scope.layout.chatMaximized = false;
+                    }
                 });
 
                 scope.$on("room", function(event, room) {
diff --git a/static/partials/chat.html b/static/partials/chat.html
index 14e5c3dc..54e74d62 100644
--- a/static/partials/chat.html
+++ b/static/partials/chat.html
@@ -2,7 +2,7 @@
 	<div class="chatpane"></div>
 	<div class="chatlist">
 		<div class="chat visible active">
-			<div class="chatheader"><div class="chatstatusicon" ng-click="activateRoom(currentRoom.id, true)"><i class="fa fa-angle-right"></i> <i class="fa fa fa-comments-o"></i></div><div class="chatheadertitle"><span>{{_("Chat sessions")}}</span></div></div>
+			<div class="chatheader"><div class="chatstatusicon" ng-click="activateRoom(currentRoom.id, true)"><i class="fa fa-angle-right"></i> <i class="fa fa fa-comments-o"></i></div><div class="chatheadertitle"><span>{{_("Chat sessions")}}</span></div> <div class="ctrl"><i ng-show="layout.chatMaximized" ng-click="toggleMax()" class="fa fa-compress"></i></div></div>
 			<div class="chatbody">
 				<div class="list-group nicescroll">
 				  <a ng-if="roomstatus" ng-click="activateRoom('', true)" class="list-group-item">