diff --git a/app/assets/javascripts/discourse/app/components/search-menu/search-term.hbs b/app/assets/javascripts/discourse/app/components/search-menu/search-term.hbs
index 7152e8f6af0..d34c37136a6 100644
--- a/app/assets/javascripts/discourse/app/components/search-menu/search-term.hbs
+++ b/app/assets/javascripts/discourse/app/components/search-menu/search-term.hbs
@@ -2,6 +2,7 @@
   id={{this.inputId}}
   type="search"
   autocomplete="off"
+  enterkeyhint="search"
   value={{this.search.activeGlobalSearchTerm}}
   placeholder={{i18n "search.title"}}
   aria-label={{i18n "search.title"}}
diff --git a/app/assets/javascripts/discourse/app/components/search-text-field.js b/app/assets/javascripts/discourse/app/components/search-text-field.js
index ce44370b1d0..81f72f501d9 100644
--- a/app/assets/javascripts/discourse/app/components/search-text-field.js
+++ b/app/assets/javascripts/discourse/app/components/search-text-field.js
@@ -7,6 +7,7 @@ import { i18n } from "discourse-i18n";
 
 export default class SearchTextField extends TextField {
   autocomplete = "off";
+  enterkeyhint = "search";
 
   @discourseComputed("searchService.searchContextEnabled")
   placeholder(searchContextEnabled) {
diff --git a/app/assets/javascripts/discourse/app/components/text-field.js b/app/assets/javascripts/discourse/app/components/text-field.js
index e75bd8f4191..c382a3a69ff 100644
--- a/app/assets/javascripts/discourse/app/components/text-field.js
+++ b/app/assets/javascripts/discourse/app/components/text-field.js
@@ -11,6 +11,7 @@ const DEBOUNCE_MS = 500;
   "autocorrect",
   "autocapitalize",
   "autofocus",
+  "enterkeyhint",
   "maxLength",
   "dir",
   "aria-label",
diff --git a/app/assets/javascripts/discourse/app/templates/full-page-search.hbs b/app/assets/javascripts/discourse/app/templates/full-page-search.hbs
index 6b692f9aeab..e13ecc4eb82 100644
--- a/app/assets/javascripts/discourse/app/templates/full-page-search.hbs
+++ b/app/assets/javascripts/discourse/app/templates/full-page-search.hbs
@@ -29,6 +29,7 @@
         @enter={{action "search" (hash collapseFilters=true)}}
         @hasAutofocus={{this.hasAutofocus}}
         @aria-controls="search-result-count"
+        type="search"
         class="full-page-search search no-blur search-query"
       />
       <ComboBox