diff --git a/client/res/templates/list-with-categories.tpl b/client/res/templates/list-with-categories.tpl
index 20c4d0875b..0c9b4fb0ce 100644
--- a/client/res/templates/list-with-categories.tpl
+++ b/client/res/templates/list-with-categories.tpl
@@ -1,6 +1,7 @@
 <div class="page-header">{{{header}}}</div>
 <div class="search-container">{{{search}}}</div>
 
+{{#unless fallback}}
 <div class="row">
     {{#if hasTree}}
     <div class="{{#if hasTree}} col-md-3 col-sm-4{{else}} col-md-12{{/if}} list-categories-column">
@@ -12,3 +13,6 @@
         <div class="list-container">{{{list}}}</div>
     </div>
 </div>
+{{else}}
+<div class="list-container">{{{list}}}</div>
+{{/unless}}
diff --git a/client/res/templates/modals/select-records-with-categories.tpl b/client/res/templates/modals/select-records-with-categories.tpl
index 59b3388953..b6631bd8f2 100644
--- a/client/res/templates/modals/select-records-with-categories.tpl
+++ b/client/res/templates/modals/select-records-with-categories.tpl
@@ -1,11 +1,13 @@
-<div class="search-container">{{{search}}}</div>
+<div class="search-container margin-bottom">{{{search}}}</div>
 
+{{#unless categoriesDisabled}}
 <div class="row row-list-container">
-    {{#unless categoriesDisabled}}
-    <div class="categories-container{{#unless categoriesDisabled}} col-md-3 col-sm-4{{else}} col-md-12{{/unless}}">{{{categories}}}</div>
-    {{/unless}}
-    <div class="list-container{{#unless categoriesDisabled}} col-md-9 col-sm-8{{else}} col-md-12{{/unless}}">{{{list}}}</div>
+    <div class="categories-container col-md-3 col-sm-4">{{{categories}}}</div>
+    <div class="list-container col-md-9 col-sm-8">{{{list}}}</div>
 </div>
+{{else}}
+<div class="list-container">{{{list}}}</div>
+{{/unless}}
 
 {{#if createButton}}
 <div class="button-container">
diff --git a/client/src/views/list-with-categories.js b/client/src/views/list-with-categories.js
index f5de95e93b..9e18e8cdcb 100644
--- a/client/src/views/list-with-categories.js
+++ b/client/src/views/list-with-categories.js
@@ -70,11 +70,13 @@ define('views/list-with-categories', ['views/list'], function (Dep) {
         nestedCollectionIsBeingFetched: false,
 
         data: function () {
-            var data = {};
+            let data = {};
 
             data.hasTree = (this.isExpanded || this.hasNavigationPanel) && !this.categoriesDisabled;
             data.hasNestedCategories = !this.isExpanded;
 
+            data.fallback = !data.hasTree && !data.hasNestedCategories;
+
             return data;
         },
 
diff --git a/client/src/views/modals/select-records-with-categories.js b/client/src/views/modals/select-records-with-categories.js
index d80ab482ac..1f81851485 100644
--- a/client/src/views/modals/select-records-with-categories.js
+++ b/client/src/views/modals/select-records-with-categories.js
@@ -26,7 +26,9 @@
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 
-define('views/modals/select-records-with-categories', ['views/modals/select-records', 'views/list-with-categories'], function (Dep, List) {
+define('views/modals/select-records-with-categories',
+['views/modals/select-records', 'views/list-with-categories'],
+function (Dep, List) {
 
     return Dep.extend({