diff --git a/core/client/assets/sass/layouts/users.scss b/core/client/assets/sass/layouts/users.scss
index 3d6f1a7dde..075fb0a061 100644
--- a/core/client/assets/sass/layouts/users.scss
+++ b/core/client/assets/sass/layouts/users.scss
@@ -4,6 +4,7 @@
 // Styles for the Users list page
 // Slug: /ghost/settings/users/
 //
+// * Container
 // * Users List
 // * Role Labels
 // * User Actions
@@ -11,6 +12,16 @@
 // ------------------------------------------------------------
 
 
+//
+// Wrapper
+// --------------------------------------------------
+
+.users-list-wrapper {
+    overflow: auto;
+    height: 100%;
+}
+
+
 //
 // Users List
 // --------------------------------------------------
diff --git a/core/client/templates/settings/users/index.hbs b/core/client/templates/settings/users/index.hbs
index 880eae1a82..1145c15c56 100644
--- a/core/client/templates/settings/users/index.hbs
+++ b/core/client/templates/settings/users/index.hbs
@@ -1,4 +1,4 @@
-{{#view "settings/users/users-list-view"}}
+{{#view "settings/users/users-list-view" class="users-list-wrapper js-users-list-view"}}
     <header class="settings-view-header user-list-header">
         {{#link-to "settings" class="btn btn-default btn-back"}}Back{{/link-to}}
         <h2 class="page-title">Users</h2>
diff --git a/core/client/views/settings/users/users-list-view.js b/core/client/views/settings/users/users-list-view.js
index 57cef02693..fc3b75a8cb 100644
--- a/core/client/views/settings/users/users-list-view.js
+++ b/core/client/views/settings/users/users-list-view.js
@@ -1,7 +1,7 @@
 import PaginationViewMixin from 'ghost/mixins/pagination-view-infinite-scroll';
 
 var UsersListView = Ember.View.extend(PaginationViewMixin, {
-    classNames: ['settings-users']
+    classNames: ['js-users-list-view']
 });
 
 export default UsersListView;