diff --git a/client/res/templates/global-search/global-search.tpl b/client/res/templates/global-search/global-search.tpl
index 92c276d3a0..cd2b17ec7d 100644
--- a/client/res/templates/global-search/global-search.tpl
+++ b/client/res/templates/global-search/global-search.tpl
@@ -1,6 +1,6 @@
 <div class="input-group has-feedback">
     <input
-        type="text"
+        type="search"
         class="form-control global-search-input"
         placeholder="{{translate 'Search'}}"
         autocomplete="espo-global-search"
diff --git a/client/res/templates/record/search.tpl b/client/res/templates/record/search.tpl
index 5488d16b3f..9d3162e9e8 100644
--- a/client/res/templates/record/search.tpl
+++ b/client/res/templates/record/search.tpl
@@ -68,7 +68,7 @@
                 </ul>
             </div>
             <input
-                type="text"
+                type="search"
                 class="form-control text-filter"
                 data-name="textFilter"
                 value="{{textFilter}}"
diff --git a/client/src/views/global-search/global-search.js b/client/src/views/global-search/global-search.js
index b78e049abc..a89de900b4 100644
--- a/client/src/views/global-search/global-search.js
+++ b/client/src/views/global-search/global-search.js
@@ -137,7 +137,7 @@ class GlobalSearchView extends SiteNavbarItemView {
 
         const key = Espo.Utils.getKeyFromKeyEvent(e);
 
-        if (e.code === 'Enter' || key === 'Enter' || key === 'Control+Enter') {
+        if (e.key === 'Enter' || key === 'Enter' || key === 'Control+Enter') {
             this.runSearch();
 
             return;
diff --git a/client/src/views/record/search.js b/client/src/views/record/search.js
index 372c946766..b0e3725d97 100644
--- a/client/src/views/record/search.js
+++ b/client/src/views/record/search.js
@@ -391,7 +391,7 @@ class SearchView extends View {
         'keydown input[data-name="textFilter"]': function (e) {
             const key = Espo.Utils.getKeyFromKeyEvent(e);
 
-            if (e.code === 'Enter' || key === 'Enter' || key === 'Control+Enter') {
+            if (e.key === 'Enter' || key === 'Enter' || key === 'Control+Enter') {
                 this.search();
 
                 this.hideApplyFiltersButton();