diff --git a/application/Espo/Core/Record/SearchParamsFetcher.php b/application/Espo/Core/Record/SearchParamsFetcher.php
index 0e9240fc40..7d766ec704 100644
--- a/application/Espo/Core/Record/SearchParamsFetcher.php
+++ b/application/Espo/Core/Record/SearchParamsFetcher.php
@@ -170,6 +170,19 @@ class SearchParamsFetcher
             throw new BadRequest('maxSize must be integer.');
         }
 
+        /** @var ?string */
+        $q = $params['q'] ?? null;
+
+        if (
+            $q !== null &&
+            strpos($q, '*') === false &&
+            strpos($q, '"') === false &&
+            strpos($q, '+') === false &&
+            strpos($q, '-') === false
+        ) {
+            $params['q'] = $q . '*';
+        }
+
         $this->handleMaxSize($params);
     }