diff --git a/src/styles/components/_chat.scss b/src/styles/components/_chat.scss
index c20ae2ab..78469eb7 100644
--- a/src/styles/components/_chat.scss
+++ b/src/styles/components/_chat.scss
@@ -26,7 +26,6 @@ width:260px;
 top:0px;
 pointer-events: none;
 z-index:45;
-overflow:hidden;
 -webkit-perspective: 1000;
 -moz-perspective: 1000;
 -o-perspective: 1000;
@@ -49,6 +48,7 @@ left:260px;
 right:0px;
 bottom:0px;
 width:260px;
+overflow:hidden;
 -webkit-transition: left 200ms ease-in-out;
 -moz-transition: left 200ms ease-in-out;
 -ms-transition: left 200ms ease-in-out;
@@ -92,6 +92,9 @@ transition: left 200ms ease-in-out;
 		border: 1px solid white;
 		font-size:.8em;
 	}
+	.list-group-item.disabled {
+		color:#eee;
+	}
 }
 .chatpane {
 position:absolute;
diff --git a/static/js/directives/chat.js b/static/js/directives/chat.js
index 3b6878c7..58880c4a 100644
--- a/static/js/directives/chat.js
+++ b/static/js/directives/chat.js
@@ -317,7 +317,7 @@ define(['underscore', 'text!partials/chat.html', 'text!partials/chatroom.html'],
                     }
 
                     if (!options.noactivate) {
-                       scope.activateRoom(subscope.id, true);
+                        scope.activateRoom(subscope.id, true);
                     }
 
                     if (options.restore && !options.noenable) {
@@ -414,24 +414,15 @@ define(['underscore', 'text!partials/chat.html', 'text!partials/chatroom.html'],
                 scope.$watch("layout.chat", function(chat) {
                     if (!chat) {
                         pane.removeClass("flip");
-                        scope.layout.chatMaximized = false;
                     }
+                    scope.layout.chatMaximized = false;
                 });
 
                 scope.$on("room", function(event, room) {
-                    if (room == null) {
-                        scope.hideRoom(controller.group);
-                    } else {
-                        var subscope;
-                        if (!controller.visibleRooms.length) {
-                            subscope = scope.showGroupRoom(null, {restore: true, noenable: true, noactivate: true});
-                        } else {
-                            subscope = controller.get(controller.group);
-                        }
-                        if (room) {
-                            var msg = translation._("You are now in room %s ...", room);
-                            subscope.$broadcast("display", null, $("<i><span>"+msg+"</span></i>"));
-                        }
+                    var subscope = scope.showGroupRoom(null, {restore: true, noenable: true, noactivate: true});
+                    if (room) {
+                        var msg = translation._("You are now in room %s ...", room);
+                        subscope.$broadcast("display", null, $("<i><span>"+msg+"</span></i>"));
                     }
                 });
 
diff --git a/static/partials/chat.html b/static/partials/chat.html
index 54e74d62..6cf221e4 100644
--- a/static/partials/chat.html
+++ b/static/partials/chat.html
@@ -1,15 +1,15 @@
-<div class="chatcontainer" ng-class="{showchatlist: !currentRoomActive}">
+<div class="chatcontainer" ng-class="{showchatlist: !currentRoomActive && layout.chat}">
 	<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 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">
+				  <a ng-if="roomstatus" ng-click="activateRoom('', true)" class="list-group-item" ng-class="{newmessage: getGroupRoom().pending}">
 				  		<span class="badge" ng-show="getGroupRoom().pending">{{getGroupRoom().pending}}</span>
-				    <i class="fa fa-users fa-lg"></i> {{_("Room chat")}}
+				    <i class="fa fa-users fa-lg"></i> {{_("Room chat")}} {{roomid}}
 				  </a>
-				  <a ng-repeat="room in getVisibleRooms()" ng-click="activateRoom(room.id, true)" class="list-group-item" ng-class="{newmessage: room.pending}">
+				  <a ng-repeat="room in getVisibleRooms()" ng-click="activateRoom(room.id, true)" class="list-group-item" ng-class="{newmessage: room.pending, disabled: !room.enabled}">
 				  	<span class="badge" ng-show="room.pending">{{room.pending}}</span><i class="fa fa-user fa-lg"></i> {{room.id|displayName}}
 				  </a>
 				</div>