diff --git a/frontend/client/src/views/global-search/global-search.js b/frontend/client/src/views/global-search/global-search.js
index 8fe1a04ffc..9c4f115425 100644
--- a/frontend/client/src/views/global-search/global-search.js
+++ b/frontend/client/src/views/global-search/global-search.js
@@ -17,14 +17,14 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with EspoCRM. If not, see http://www.gnu.org/licenses/.
- ************************************************************************/ 
+ ************************************************************************/
 
 Espo.define('Views.GlobalSearch.GlobalSearch', 'View', function (Dep) {
 
     return Dep.extend({
 
         template: 'global-search.global-search',
-        
+
         events: {
             'keypress #global-search-input': function (e) {
                 if (e.keyCode == 13) {
@@ -34,10 +34,13 @@ Espo.define('Views.GlobalSearch.GlobalSearch', 'View', function (Dep) {
             'click [data-action="search"]': function () {
                 this.runSearch();
             },
+            'focus #global-search-input': function (e) {
+                e.currentTarget.select();
+            }
         },
-        
+
         setup: function () {
-            
+
             this.wait(true);
             this.getCollectionFactory().create('GlobalSearch', function (collection) {
                 this.collection = collection;
diff --git a/frontend/client/src/views/record/search.js b/frontend/client/src/views/record/search.js
index 6051d79ae9..f89b4d7ac9 100644
--- a/frontend/client/src/views/record/search.js
+++ b/frontend/client/src/views/record/search.js
@@ -134,6 +134,9 @@ Espo.define('Views.Record.Search', 'View', function (Dep) {
                     this.search();
                 }
             },
+            'focus input[name="textFilter"]': function (e) {
+                e.currentTarget.select();
+            },
             'click button[data-action="search"]': function (e) {
                 this.search();
             },