diff --git a/src/components/UserList.scss b/src/components/UserList.scss
index 76987828cd..139d1b2dc0 100644
--- a/src/components/UserList.scss
+++ b/src/components/UserList.scss
@@ -7,6 +7,10 @@
     display: flex;
     flex-wrap: wrap;
     justify-content: flex-end;
+
+    &:empty {
+      display: none;
+    }
   }
 
   .UserList > * {
diff --git a/src/css/styles.scss b/src/css/styles.scss
index 5119ecb6c6..f6ee94b2c8 100644
--- a/src/css/styles.scss
+++ b/src/css/styles.scss
@@ -311,7 +311,7 @@
   }
 
   .App-menu_top {
-    grid-template-columns: 1fr auto 1fr;
+    grid-template-columns: auto max-content auto;
     grid-gap: 4px;
     align-items: flex-start;
     cursor: default;