diff --git a/css/converse.css b/css/converse.css
index 9477ca8a6..632463d11 100644
--- a/css/converse.css
+++ b/css/converse.css
@@ -2004,9 +2004,9 @@
         #conversejs .chatroom .box-flyout .chatroom-body .chat-area .chat-content {
           padding: 0 0.5em 0 0.5em; }
         #conversejs .chatroom .box-flyout .chatroom-body .chat-area.full {
-          max-width: 100%; }
+          min-width: 100%; }
           #conversejs .chatroom .box-flyout .chatroom-body .chat-area.full .new-msgs-indicator {
-            max-width: 100%; }
+            min-width: 100%; }
       #conversejs .chatroom .box-flyout .chatroom-body .mentioned {
         font-weight: bold; }
       #conversejs .chatroom .box-flyout .chatroom-body .chat-msg-room {
diff --git a/sass/_chatrooms.scss b/sass/_chatrooms.scss
index 11c286fec..54e0ff2d4 100644
--- a/sass/_chatrooms.scss
+++ b/sass/_chatrooms.scss
@@ -59,9 +59,9 @@
                         padding: 0 0.5em 0 0.5em;
                     }
                     &.full {
-                        max-width: 100%;
+                        min-width: 100%;
                         .new-msgs-indicator {
-                            max-width: 100%;
+                            min-width: 100%;
                         }
                     }
                 }
diff --git a/src/converse-muc.js b/src/converse-muc.js
index ce42eb341..5a570b539 100755
--- a/src/converse-muc.js
+++ b/src/converse-muc.js
@@ -263,16 +263,15 @@
                         // Bit of a hack, to make sure that the sidebar's state doesn't change
                         this.model.set({hidden_occupants: !this.model.get('hidden_occupants')});
                     }
-                    var $el = this.$('.icon-hide-users');
                     if (!this.model.get('hidden_occupants')) {
                         this.model.save({hidden_occupants: true});
-                        $el.removeClass('icon-hide-users').addClass('icon-show-users');
+                        this.$('.icon-hide-users').removeClass('icon-hide-users').addClass('icon-show-users');
                         this.$('.occupants').addClass('hidden');
                         this.$('.chat-area').addClass('full');
                         this.scrollDown();
                     } else {
                         this.model.save({hidden_occupants: false});
-                        $el.removeClass('icon-show-users').addClass('icon-hide-users');
+                        this.$('.icon-show-users').removeClass('icon-show-users').addClass('icon-hide-users');
                         this.$('.chat-area').removeClass('full');
                         this.$('div.occupants').removeClass('hidden');
                         this.scrollDown();