diff --git a/src/components/settings_modal/admin_tabs/admin_user_card.scss b/src/components/settings_modal/admin_tabs/admin_user_card.scss
index 07662ce6d..a9010afdc 100644
--- a/src/components/settings_modal/admin_tabs/admin_user_card.scss
+++ b/src/components/settings_modal/admin_tabs/admin_user_card.scss
@@ -1,9 +1,14 @@
 .AdminUserCard {
-  width: 100%;
-
   .right-side {
     align-items: baseline;
     justify-content: end;
     display: flex;
+    flex-wrap: wrap;
+    gap: 0.5em;
+    margin-top: 0.5em;
+
+    .alert {
+      margin: 0;
+    }
   }
 }
diff --git a/src/components/settings_modal/admin_tabs/users_tab.scss b/src/components/settings_modal/admin_tabs/users_tab.scss
index 537e43d09..70237c189 100644
--- a/src/components/settings_modal/admin_tabs/users_tab.scss
+++ b/src/components/settings_modal/admin_tabs/users_tab.scss
@@ -6,7 +6,9 @@
 
   .filters-section {
     display: grid;
-    grid-template-columns: 1fr 1fr 1fr;
+    grid-template-columns: repeat(auto-fit, minmax(15em, 1fr));
+    grid-auto-columns: 1fr;
+    grid-auto-flow: row;
     gap: 0.5em 1em;
 
     > div {