diff --git a/apps/meteor/client/views/admin/users/UsersTable/UsersTable.tsx b/apps/meteor/client/views/admin/users/UsersTable/UsersTable.tsx
index c287819237d3..f2e8a468f66e 100644
--- a/apps/meteor/client/views/admin/users/UsersTable/UsersTable.tsx
+++ b/apps/meteor/client/views/admin/users/UsersTable/UsersTable.tsx
@@ -86,26 +86,32 @@ const UsersTable = ({ reload, tab, onReload }: UsersTableProps): ReactElement |
const headers = useMemo(
() => [
-
- {t('Name')}
- ,
+ mediaQuery && (
+
+ {t('Name')}
+
+ ),
{t('Username')}
,
-
- {t('Email')}
- ,
+ mediaQuery && (
+
+ {t('Email')}
+
+ ),
-
- {t('Roles')}
- ,
+ mediaQuery && (
+
+ {t('Roles')}
+
+ ),
tab === 'all' && (
+
{t('Pending_action')}
),
- ,
+ ,
],
- [setSort, sortBy, sortDirection, t, tab],
+ [mediaQuery, setSort, sortBy, sortDirection, t, tab],
);
return (
diff --git a/apps/meteor/client/views/admin/users/UsersTable/UsersTableRow.tsx b/apps/meteor/client/views/admin/users/UsersTable/UsersTableRow.tsx
index 64dba94645b9..81e821e8121c 100644
--- a/apps/meteor/client/views/admin/users/UsersTable/UsersTableRow.tsx
+++ b/apps/meteor/client/views/admin/users/UsersTable/UsersTableRow.tsx
@@ -88,15 +88,16 @@ const UsersTableRow = ({ user, onClick, mediaQuery, refetchUsers, onReload, tab
onClick={(e): void => {
e.stopPropagation();
}}
+ w='fit-content'
>
{active ? t('User_first_log_in') : t('Activation')}
{active ? (
-