diff --git a/html/main.html b/html/main.html
index e64ad186..df01555f 100644
--- a/html/main.html
+++ b/html/main.html
@@ -16,7 +16,7 @@
     <status-message ng-controller="StatusmessageController"></status-message>
     <div class="ng-cloak right">
         <button title="{{_('Share your screen')}}" class="btn aenablebtn" ng-show="master.settings.screensharingMedia && (status=='connected' || status=='conference' || enabledScreenshare)" ng-model="enableScreenshare" btn-checkbox><i class="fa fa-desktop"></i></button>
-        <button title="{{_('Chat')}}" class="btn" ng-model="chatEnabled" btn-checkbox btn-checkbox-true="true" btn-checkbox-false="false"><i class="fa fa-comments-o"></i></button>
+        <button title="{{_('Chat')}}" ng-show="roomstatus" class="btn" ng-model="chatEnabled" btn-checkbox btn-checkbox-true="true" btn-checkbox-false="false"><i class="fa fa-comments-o"></i></button>
         <button title="{{_('Mute microphone')}}" class="btn amutebtn" ng-model="microphoneMute" btn-checkbox btn-checkbox-true="true" btn-checkbox-false="false"><i class="fa fa-microphone-slash"></i></button>
         <button title="{{_('Turn camera off')}}" class="btn amutebtn" ng-model="cameraMute" btn-checkbox btn-checkbox-true="true" btn-checkbox-false="false"><i class="fa fa-eye-slash"></i></button>
         <button title="{{_('Settings')}}" class="btn" ng-model="showSettings" btn-checkbox btn-checkbox-true="1" btn-checkbox-false="0"><i class="fa fa-cog"></i></button>
@@ -36,7 +36,7 @@
 <div id="screenshare" class="ng-cloak mainview" ng-show="mainview=='screenshare'">
     <screenshare/>
 </div>
-<div class="ng-cloak nicescroll" id="rightslide" ng-class="{slideright: !showBuddylist}">
+<div class="ng-cloak nicescroll" id="rightslide" ng-show="roomstatus" ng-class="{slideright: !showBuddylist}">
     <div class="rightslidepane">
         <div id="buddylist"><buddy-list/></div>
         <div id="chat"><chat/></div>