diff --git a/client/res/templates/record/search.tpl b/client/res/templates/record/search.tpl
index 637f1f3a73..3780aebf9c 100644
--- a/client/res/templates/record/search.tpl
+++ b/client/res/templates/record/search.tpl
@@ -1,6 +1,6 @@
 
 <div class="row search-row">
-    <div class="form-group col-md-6 col-sm-7">
+    <div class="form-group{{#if isWide}} col-lg-7{{/if}} col-md-8 col-sm-9">
         <div class="input-group">
             <div class="input-group-btn left-dropdown{{#unless leftDropdown}} hidden{{/unless}}">
                 <button type="button" class="btn btn-default dropdown-toggle filters-button" title="{{translate 'Filter'}}" data-toggle="dropdown" tabindex="-1">
@@ -32,24 +32,22 @@
                 <button type="button" class="btn btn-primary search btn-icon btn-icon-x-wide" data-action="search" title="{{translate 'Search'}}">
                     <span class="fa fa-search"></span>
                 </button>
+                <button type="button" class="btn btn-default btn-icon-x-wide" data-action="reset" title="{{translate 'Reset'}}">
+                    <span class="fas fa-redo-alt"></span>
+                </button>
+                <button type="button" class="btn btn-default btn-icon-wide dropdown-toggle add-filter-button" data-toggle="dropdown" tabindex="-1">
+                    <span class="fas fa-ellipsis-v"></span>
+                </button>
+                <ul class="dropdown-menu pull-right filter-list">
+                    <li class="dropdown-header">{{translate 'Add Field'}}</li>
+                    {{#each advancedFields}}
+                        <li data-name="{{name}}" class="{{#if checked}}hidden{{/if}}"><a href="javascript:" class="add-filter" data-action="addFilter" data-name="{{name}}">{{translate name scope=../entityType category='fields'}}</a></li>
+                    {{/each}}
+                </ul>
             </div>
         </div>
     </div>
-    <div class="form-group col-md-6 col-sm-5">
-        <div class="btn-group search-right-buttons-group">
-            <button type="button" class="btn btn-default btn-icon-x-wide" data-action="reset" title="{{translate 'Reset'}}">
-                <span class="fas fa-redo-alt"></span>
-            </button>
-            <button type="button" class="btn btn-default btn-icon-wide dropdown-toggle add-filter-button" data-toggle="dropdown" tabindex="-1">
-                <span class="fas fa-ellipsis-v"></span>
-            </button>
-            <ul class="dropdown-menu pull-right filter-list">
-                <li class="dropdown-header">{{translate 'Add Field'}}</li>
-                {{#each advancedFields}}
-                    <li data-name="{{name}}" class="{{#if checked}}hidden{{/if}}"><a href="javascript:" class="add-filter" data-action="addFilter" data-name="{{name}}">{{translate name scope=../entityType category='fields'}}</a></li>
-                {{/each}}
-            </ul>
-        </div>
+    <div class="form-group{{#if isWide}} col-lg-5{{/if}} col-md-4 col-sm-3">
         {{#if hasViewModeSwitcher}}
         <div class="btn-group view-mode-switcher-buttons-group">
             {{#each viewModeDataList}}
diff --git a/client/src/views/list.js b/client/src/views/list.js
index baba8752db..b096f2f495 100644
--- a/client/src/views/list.js
+++ b/client/src/views/list.js
@@ -188,7 +188,8 @@ define('views/list', ['views/main', 'search-manager'], function (Dep, SearchMana
                 searchManager: this.searchManager,
                 scope: this.scope,
                 viewMode: this.viewMode,
-                viewModeList: this.viewModeList
+                viewModeList: this.viewModeList,
+                isWide: true,
             }, function (view) {
                 this.listenTo(view, 'reset', function () {
                     this.resetSorting();
diff --git a/client/src/views/record/search.js b/client/src/views/record/search.js
index 504fb72527..1a8b890dcc 100644
--- a/client/src/views/record/search.js
+++ b/client/src/views/record/search.js
@@ -72,7 +72,8 @@ define('views/record/search', 'view', function (Dep) {
                 textFilterDisabled: this.textFilterDisabled,
                 viewMode: this.viewMode,
                 viewModeDataList: this.viewModeDataList || [],
-                hasViewModeSwitcher: this.viewModeList && this.viewModeList.length > 1
+                hasViewModeSwitcher: this.viewModeList && this.viewModeList.length > 1,
+                isWide: this.options.isWide,
             };
         },
 
diff --git a/frontend/less/espo/custom.less b/frontend/less/espo/custom.less
index 84d676b146..b98f01b021 100644
--- a/frontend/less/espo/custom.less
+++ b/frontend/less/espo/custom.less
@@ -748,16 +748,6 @@ ul.dropdown-menu > li.checkbox:last-child {
     margin-right: @panel-padding;
 }
 
-.search-row {
-    margin-left: -3px !important;
-    margin-right: -3px !important;
-}
-
-.search-row > div {
-    padding-left: 2px !important;
-    padding-right: 2px !important;
-}
-
 .cell > .field {
     overflow-wrap: break-word;
     word-wrap: break-word;
@@ -2665,10 +2655,6 @@ pre > code {
     }
 }
 
-.search-container input.text-filter {
-    margin-left: 0 !important;
-}
-
 @media screen and (min-width: @screen-sm-min) {
     .search-container .view-mode-switcher-buttons-group {
         float: right;
@@ -2698,7 +2684,7 @@ pre > code {
         width: 100%;
     }
 
-    .search-row .search-right-buttons-group {
+    .search-row .view-mode-switcher-buttons-group {
         float: right;
     }