diff --git a/frontend/pages/admin/TeamManagementPage/_styles.scss b/frontend/pages/admin/TeamManagementPage/_styles.scss
index 144a59f345..0878a2e6fe 100644
--- a/frontend/pages/admin/TeamManagementPage/_styles.scss
+++ b/frontend/pages/admin/TeamManagementPage/_styles.scss
@@ -9,29 +9,31 @@
     .data-table__table {
       thead {
         .name__header {
-          width: $col-md;
+          width: auto;
         }
 
-        .host_count__header {
+        .host_count__header,
+        .user_count__header {
           width: $col-md;
         }
 
         .actions__header {
-          width: auto;
+          width: $col-sm;
         }
       }
 
       tbody {
         .name__cell {
-          max-width: $col-md;
+          width: auto;
         }
 
-        .host_count__cell {
+        .host_count__cell,
+        .user_count__cell {
           max-width: $col-md;
         }
 
         .actions__cell {
-          width: auto;
+          width: $col-sm;
         }
       }
     }
diff --git a/frontend/pages/hosts/details/cards/Queries/_styles.scss b/frontend/pages/hosts/details/cards/Queries/_styles.scss
index 253eb5ac35..97b8724cc9 100644
--- a/frontend/pages/hosts/details/cards/Queries/_styles.scss
+++ b/frontend/pages/hosts/details/cards/Queries/_styles.scss
@@ -6,7 +6,7 @@
     .data-table__table {
       thead {
         .query_name__header {
-          width: $col-lg;
+          min-width: $col-lg;
         }
         .last_fetched__header {
           display: table-cell;
@@ -21,7 +21,7 @@
       tbody {
         tr {
           .query_name__cell {
-            width: $col-lg;
+            min-width: $col-lg;
           }
           .last_fetched__cell {
             display: table-cell;