diff --git a/bigbluebutton-html5/imports/ui/components/user-list/component.jsx b/bigbluebutton-html5/imports/ui/components/user-list/component.jsx
index d28fccb208..c5d135a524 100755
--- a/bigbluebutton-html5/imports/ui/components/user-list/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/user-list/component.jsx
@@ -61,6 +61,16 @@ class UserList extends Component {
         element.childNodes[this.counter].focus();
         this.counter++;
         break;
+      case 'up':
+        this.counter--;
+        element.childNodes[this.counter].tabIndex = 0;
+        element.childNodes[this.counter].focus();
+        break;
+      case 'upLoopUp':
+      case 'upLoopDown':
+        this.counter = count - 1;
+        select();
+        break;
       case 'downLoopDown':
         this.counter = -1;
         select();
@@ -69,20 +79,6 @@ class UserList extends Component {
         this.counter = 1;
         select();
         break;
-      case 'up':
-        this.counter--;
-        element.childNodes[this.counter].tabIndex = 0;
-        element.childNodes[this.counter].focus();
-        break;
-      case 'upLoopUp':
-        this.counter = count - 1;
-        select();
-        break;
-      case 'upLoopDown':
-        this.counter = count - 1;
-        element.childNodes[this.counter].tabIndex = 0;
-        element.childNodes[this.counter].focus();
-        break;
     }
   }