diff --git a/bigbluebutton-html5/imports/ui/components/user-list/user-list-content/waiting-users/component.jsx b/bigbluebutton-html5/imports/ui/components/user-list/user-list-content/waiting-users/component.jsx
index 2520a2fb66d9a832ae3100d58f962ccbf95a02ea..7b33d8da379d4084514154ab0fe9177a55dcc1a2 100644
--- a/bigbluebutton-html5/imports/ui/components/user-list/user-list-content/waiting-users/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/user-list/user-list-content/waiting-users/component.jsx
@@ -30,6 +30,8 @@ class WaitingUsers extends PureComponent {
         ? 'userlist'
         : 'waitingUsersPanel',
     );
+
+    window.dispatchEvent(new Event('panelChanged'));
   }
 
   render() {
diff --git a/bigbluebutton-html5/imports/ui/components/waiting-users/component.jsx b/bigbluebutton-html5/imports/ui/components/waiting-users/component.jsx
index db6ee3d12c3a5993bc5acaf0beda90a37a343bd0..853113f49e86d30a14b80de6760982479f6f6110 100755
--- a/bigbluebutton-html5/imports/ui/components/waiting-users/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/waiting-users/component.jsx
@@ -153,7 +153,10 @@ const WaitingUsers = (props) => {
       authenticatedUsers,
       guestUsers,
     } = props;
-    if (!authenticatedUsers.length && !guestUsers.length) Session.set('openPanel', 'userlist');
+    if (!authenticatedUsers.length && !guestUsers.length) {
+      Session.set('openPanel', 'userlist');
+      window.dispatchEvent(new Event('panelChanged'));
+    }
   });
 
   const {
@@ -239,6 +242,7 @@ const WaitingUsers = (props) => {
           <Button
             onClick={() => {
               Session.set('openPanel', 'userlist');
+              window.dispatchEvent(new Event('panelChanged'));
             }}
             label={intl.formatMessage(intlMessages.title)}
             icon="left_arrow"