diff --git a/web/styles/settings.css b/web/styles/settings.css
index 5d310806ce..c1640597f9 100644
--- a/web/styles/settings.css
+++ b/web/styles/settings.css
@@ -218,12 +218,6 @@ h3,
     & table + .progressive-table-wrapper table tr.user_row td:first-of-type {
         width: 20%;
     }
-
-    /* Limit the actions column to not using excessive width */
-    .admin-table-wrapper table.admin_profile_fields_table tr .actions {
-        width: 11%;
-        min-width: 70px;
-    }
 }
 
 #uploaded_files_table > tr > td:nth-of-type(1),
diff --git a/web/templates/settings/admin_profile_field_list.hbs b/web/templates/settings/admin_profile_field_list.hbs
index 1cf9d0e9d7..24c424e062 100644
--- a/web/templates/settings/admin_profile_field_list.hbs
+++ b/web/templates/settings/admin_profile_field_list.hbs
@@ -24,7 +24,7 @@
         {{/if}}
     </td>
     {{#if ../can_modify}}
-    <td>
+    <td class="actions">
         <button class="button rounded small btn-warning open-edit-form-modal" title="{{t 'Edit' }}" data-profile-field-id="{{id}}">
             <i class="fa fa-pencil" aria-hidden="true"></i>
         </button>
diff --git a/web/templates/settings/profile_field_settings_admin.hbs b/web/templates/settings/profile_field_settings_admin.hbs
index 5c74ac1074..e849bdb803 100644
--- a/web/templates/settings/profile_field_settings_admin.hbs
+++ b/web/templates/settings/profile_field_settings_admin.hbs
@@ -6,7 +6,7 @@
         <button class="button rounded sea-green" id="add-custom-profile-field-btn">{{t "Add a new profile field" }}</button>
         {{/if}}
     </div>
-    <div class="admin-table-wrapper">
+    <div class="admin-table-wrapper" data-simplebar>
         <table class="table table-striped admin_profile_fields_table">
             <thead>
                 <tr>