diff --git a/client/res/templates/record/list-tree.tpl b/client/res/templates/record/list-tree.tpl
index 58910cf0b4..52838275e4 100644
--- a/client/res/templates/record/list-tree.tpl
+++ b/client/res/templates/record/list-tree.tpl
@@ -20,7 +20,7 @@
     <a href="#{{scope}}" class="action link{{#if rootIsSelected}} text-bold{{/if}}" data-action="selectRoot">{{rootName}}</a>
     {{/if}}
     {{#if showEditLink}}
-    <a href="#{{scope}}" class="small pull-right" title="{{translate 'Manage Categories' scope=scope}}"><span class="glyphicon glyphicon-th-list"></span></a>
+    <a href="#{{scope}}" class="small pull-right action" data-action="manageCategories" title="{{translate 'Manage Categories' scope=scope}}"><span class="glyphicon glyphicon-th-list"></span></a>
     {{/if}}
 
     <ul class="list-group list-group-tree list-group-no-border">
diff --git a/client/src/views/list-with-categories.js b/client/src/views/list-with-categories.js
index 96647506e9..6c686ea810 100644
--- a/client/src/views/list-with-categories.js
+++ b/client/src/views/list-with-categories.js
@@ -156,8 +156,12 @@ Espo.define('views/list-with-categories', 'views/list', function (Dep) {
                 data[nameAttribute] = this.currentCategoryName;
                 return data;
             }
+        },
+
+        actionManageCategories: function () {
+            this.clearView('categories');
+            this.getRouter().navigate('#' + this.categoryScope, {trigger: true});
         }
 
     });
 });
-
diff --git a/client/src/views/user/list.js b/client/src/views/user/list.js
index ca6d81b16c..55d48d895b 100644
--- a/client/src/views/user/list.js
+++ b/client/src/views/user/list.js
@@ -30,6 +30,8 @@ Espo.define('views/user/list', 'views/list', function (Dep) {
 
     return Dep.extend({
 
+        storeViewAfterUpdate: false,
+
         setup: function () {
             Dep.prototype.setup.call(this);
         }