diff --git a/client/res/templates/fields/base/search.tpl b/client/res/templates/fields/base/search.tpl
index 4e034c1568..adbaaa0394 100644
--- a/client/res/templates/fields/base/search.tpl
+++ b/client/res/templates/fields/base/search.tpl
@@ -1,6 +1,6 @@
 <input
     type="text"
-    class="main-element form-control input-sm search-input"
+    class="main-element form-control input-sm"
     data-name="{{name}}"
     value="{{searchParams.value}}" {{#if params.maxLength}}
     maxlength="{{params.maxLength}}"{{/if}}{{#if params.size}}
diff --git a/client/res/templates/fields/date/search.tpl b/client/res/templates/fields/date/search.tpl
index 46765db7e6..ae00092574 100644
--- a/client/res/templates/fields/date/search.tpl
+++ b/client/res/templates/fields/date/search.tpl
@@ -3,7 +3,7 @@
 </select>
 <div class="input-group primary">
     <input
-        class="main-element form-control input-sm search-input"
+        class="main-element form-control input-sm"
         type="text"
         data-name="{{name}}"
         value="{{dateValue}}"
@@ -19,7 +19,7 @@
 </div>
 <div class="input-group{{#ifNotEqual searchType 'between'}} hidden{{/ifNotEqual}} additional">
     <input
-        class="main-element form-control input-sm additional search-input"
+        class="main-element form-control input-sm additional"
         type="text"
         value="{{dateValueTo}}"
         autocomplete="espo-{{name}}"
@@ -33,7 +33,7 @@
 </div>
 <div class="hidden additional-number">
     <input
-        class="main-element form-control input-sm number search-input"
+        class="main-element form-control input-sm number"
         type="number"
         value="{{number}}"
         placeholder ="{{translate 'Number'}}"
diff --git a/client/res/templates/fields/int/search.tpl b/client/res/templates/fields/int/search.tpl
index 13e99767e4..455013a419 100644
--- a/client/res/templates/fields/int/search.tpl
+++ b/client/res/templates/fields/int/search.tpl
@@ -3,7 +3,7 @@
 </select>
 <input
     type="text"
-    class="form-control input-sm hidden search-input"
+    class="form-control input-sm hidden"
     data-name="{{name}}"
     value="{{value}}"
     pattern="[\-]?[0-9]*"
@@ -14,7 +14,7 @@
 >
 <input
     type="text"
-    class="form-control{{#ifNotEqual searchType 'between'}} hidden{{/ifNotEqual}} additional input-sm search-input"
+    class="form-control{{#ifNotEqual searchType 'between'}} hidden{{/ifNotEqual}} additional input-sm"
     data-name="{{name}}-additional"
     value="{{value2}}"
     pattern="[\-]?[0-9]*"
diff --git a/client/res/templates/fields/link-multiple/search.tpl b/client/res/templates/fields/link-multiple/search.tpl
index fd2dfcad19..d0805d233b 100644
--- a/client/res/templates/fields/link-multiple/search.tpl
+++ b/client/res/templates/fields/link-multiple/search.tpl
@@ -9,7 +9,7 @@
 
     <div class="input-group add-team">
         <input
-            class="main-element form-control input-sm search-input"
+            class="main-element form-control input-sm"
             type="text"
             value=""
             autocomplete="espo-{{name}}"
diff --git a/client/res/templates/fields/link-parent/search.tpl b/client/res/templates/fields/link-parent/search.tpl
index 1dbae533fc..ef6f664880 100644
--- a/client/res/templates/fields/link-parent/search.tpl
+++ b/client/res/templates/fields/link-parent/search.tpl
@@ -7,7 +7,7 @@
     </select>
     <div class="input-group">
         <input
-            class="form-control input-sm search-input"
+            class="form-control input-sm"
             type="text"
             data-name="{{nameName}}"
             value="{{searchData.nameValue}}"
diff --git a/client/res/templates/fields/link/search.tpl b/client/res/templates/fields/link/search.tpl
index 48dfacc443..83d54cb049 100644
--- a/client/res/templates/fields/link/search.tpl
+++ b/client/res/templates/fields/link/search.tpl
@@ -4,7 +4,7 @@
 <div class="primary">
 	<div class="input-group">
 	    <input
-            class="form-control input-sm search-input"
+            class="form-control input-sm"
             type="text"
             data-name="{{nameName}}"
             value="{{searchData.nameValue}}"
diff --git a/client/res/templates/fields/text/search.tpl b/client/res/templates/fields/text/search.tpl
index f3ef1dbd1b..c01dff00ba 100644
--- a/client/res/templates/fields/text/search.tpl
+++ b/client/res/templates/fields/text/search.tpl
@@ -3,7 +3,7 @@
 </select>
 <input
     type="text"
-    class="main-element form-control input-sm search-input"
+    class="main-element form-control input-sm"
     data-name="{{name}}"
     value="{{searchData.value}}"
     {{#if params.maxLength}}maxlength="{{params.maxLength}}"{{/if}}
diff --git a/client/res/templates/fields/user/search.tpl b/client/res/templates/fields/user/search.tpl
index f8f276ee77..6f9c328372 100644
--- a/client/res/templates/fields/user/search.tpl
+++ b/client/res/templates/fields/user/search.tpl
@@ -4,7 +4,7 @@
 <div class="primary">
 	<div class="input-group">
 	    <input
-            class="form-control input-sm search-input"
+            class="form-control input-sm"
             type="text"
             data-name="{{nameName}}"
             value="{{searchData.nameValue}}"
@@ -37,7 +37,7 @@
 
     <div class="input-group add-team">
         <input
-            class="form-control input-sm element-one-of search-input"
+            class="form-control input-sm element-one-of"
             type="text"
             value=""
             autocomplete="espo-{{name}}"
@@ -61,7 +61,7 @@
     </div>
     <div class="input-group add-team">
         <input
-            class="form-control input-sm element-teams search-input"
+            class="form-control input-sm element-teams"
             type="text"
             value=""
             autocomplete="espo-{{name}}"
diff --git a/client/res/templates/fields/varchar/search.tpl b/client/res/templates/fields/varchar/search.tpl
index 4b7ac4812d..3d494d4705 100644
--- a/client/res/templates/fields/varchar/search.tpl
+++ b/client/res/templates/fields/varchar/search.tpl
@@ -3,7 +3,7 @@
 </select>
 <input
     type="text"
-    class="main-element form-control input-sm search-input"
+    class="main-element form-control input-sm"
     data-name="{{name}}"
     value="{{searchData.value}}" {{#if params.maxLength}}
     maxlength="{{params.maxLength}}"{{/if}}{{#if params.size}}
diff --git a/client/src/views/fields/base.js b/client/src/views/fields/base.js
index 778ff6dbc1..fe58664e15 100644
--- a/client/src/views/fields/base.js
+++ b/client/src/views/fields/base.js
@@ -710,8 +710,8 @@ define('views/fields/base', ['view'], function (Dep) {
                 this.searchData = {};
                 this.setupSearch();
 
-                this.events['keydown input.search-input'] = e => {
-                    if ('keyCode' in e && e.keyCode === 13) {
+                this.events['keydown.' + this.cid] = e => {
+                    if (Espo.Utils.getKeyFromKeyEvent(e) === 'Control+Enter') {
                         this.trigger('search');
                     }
                 };
diff --git a/client/src/views/global-search/global-search.js b/client/src/views/global-search/global-search.js
index 1fedb240be..18eba059af 100644
--- a/client/src/views/global-search/global-search.js
+++ b/client/src/views/global-search/global-search.js
@@ -33,8 +33,8 @@ define('views/global-search/global-search', ['view'], function (Dep) {
         template: 'global-search/global-search',
 
         events: {
-            'keypress input.global-search-input': function (e) {
-                if (e.keyCode === 13) {
+            'keydown input.global-search-input': function (e) {
+                if (e.code === 'Enter') {
                     this.runSearch();
                 }
             },
diff --git a/client/src/views/record/search.js b/client/src/views/record/search.js
index 3256d59f56..a4b4ae3771 100644
--- a/client/src/views/record/search.js
+++ b/client/src/views/record/search.js
@@ -317,8 +317,8 @@ define('views/record/search', ['view'], function (Dep) {
         },
 
         events: {
-            'keypress input[data-name="textFilter"]': function (e) {
-                if (e.keyCode === 13) {
+            'keydown input[data-name="textFilter"]': function (e) {
+                if (e.code === 'Enter') {
                     this.search();
 
                     this.hideApplyFiltersButton();