diff --git a/bigbluebutton-html5/imports/ui/components/user-list/user-list-content/user-participants/component.jsx b/bigbluebutton-html5/imports/ui/components/user-list/user-list-content/user-participants/component.jsx
index 30b247865ab0d68eebee00d95e58b107200d224c..27706031cc16ad56a5f72cc0c5c237f1f70f073b 100755
--- a/bigbluebutton-html5/imports/ui/components/user-list/user-list-content/user-participants/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/user-list/user-list-content/user-participants/component.jsx
@@ -94,9 +94,11 @@ class UserParticipants extends Component {
     return !isPropsEqual || !isStateEqual;
   }
 
-  componentDidUpdate() {
+  componentDidUpdate(prevProps, prevState) {
     const { selectedUser } = this.state;
 
+    if (selectedUser === prevState.selectedUser) return;
+
     if (selectedUser) {
       const { firstChild } = selectedUser;
       if (firstChild) firstChild.focus();
diff --git a/bigbluebutton-html5/imports/ui/components/user-list/user-list-content/user-participants/user-list-item/user-dropdown/component.jsx b/bigbluebutton-html5/imports/ui/components/user-list/user-list-content/user-participants/user-list-item/user-dropdown/component.jsx
index 025af5e902a444a48f6e4f7167e130cc138e333a..c236cdc09b71e3520569a85c11897979fcbf1bb8 100755
--- a/bigbluebutton-html5/imports/ui/components/user-list/user-list-content/user-participants/user-list-item/user-dropdown/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/user-list/user-list-content/user-participants/user-list-item/user-dropdown/component.jsx
@@ -154,7 +154,6 @@ class UserDropdown extends PureComponent {
 
   componentDidUpdate() {
     const { dropdownVisible } = this.props;
-    if (!dropdownVisible) document.activeElement.blur();
     this.checkDropdownDirection();
   }