diff --git a/src/api/app/views/layouts/webui/_top_navigation_search.html.haml b/src/api/app/views/layouts/webui/_top_navigation_search.html.haml
index 3da33b06f72..c14bc2cdcf2 100644
--- a/src/api/app/views/layouts/webui/_top_navigation_search.html.haml
+++ b/src/api/app/views/layouts/webui/_top_navigation_search.html.haml
@@ -1,2 +1,2 @@
 = form_tag(search_path(project: 1, package: 1, name: 1), method: :get, class: 'my-auto') do
-  %input.form-control.w-100{ 'aria-label': 'Search', name: 'search_text', placeholder: 'Search', type: 'text' }/
+  %input.form-control.w-100{ 'aria-label': 'Search', name: 'search_text', placeholder: 'Search', type: 'search' }/
diff --git a/src/api/app/views/webui/search/index.html.haml b/src/api/app/views/webui/search/index.html.haml
index 0d246388787..6df7efdc8f2 100644
--- a/src/api/app/views/webui/search/index.html.haml
+++ b/src/api/app/views/webui/search/index.html.haml
@@ -7,8 +7,8 @@
     .d-flex.justify-content-center
       = form_tag(search_path, method: :get, class: 'my-3 w-75') do
         .mb-3.input-group
-          = text_field_tag('search_text', params[:search_text], placeholder: 'Search', autofocus: true,
-                           required: true, minlength: 2, class: 'form-control rounded', id: 'search_input')
+          = search_field_tag('search_text', params[:search_text], placeholder: 'Search', autofocus: true,
+                             required: true, minlength: 2, class: 'form-control rounded', id: 'search_input')
           %button.btn.btn-primary.ms-1{ type: 'submit', title: 'Search' }
             %i.fa.fa-search
 
diff --git a/src/api/app/views/webui/search/issue.html.haml b/src/api/app/views/webui/search/issue.html.haml
index 40106fcfc47..fa2e6000e8f 100644
--- a/src/api/app/views/webui/search/issue.html.haml
+++ b/src/api/app/views/webui/search/issue.html.haml
@@ -7,7 +7,7 @@
     .d-flex.justify-content-center
       = form_tag(search_issue_path, method: :get, class: 'my-3 w-75') do
         .mb-3.input-group
-          = text_field_tag('issue', params[:issue], placeholder: 'Issue ID', autofocus: true, required: true, class: 'form-control')
+          = search_field_tag('issue', params[:issue], placeholder: 'Issue ID', autofocus: true, required: true, class: 'form-control')
 
           = select_tag(:issue_tracker, options_for_select(@issue_tracker_list, params[:issue_tracker] || @default_tracker),
                       class: 'form-select rounded-end')
diff --git a/src/api/app/views/webui/search/owner.html.haml b/src/api/app/views/webui/search/owner.html.haml
index 91c65c2e809..333e319f384 100644
--- a/src/api/app/views/webui/search/owner.html.haml
+++ b/src/api/app/views/webui/search/owner.html.haml
@@ -8,8 +8,8 @@
       = form_tag(search_owner_path, method: :get, class: 'my-3 w-75') do
         %input{ name: 'owner', type: 'hidden', value: '1' }
         .mb-3.d-flex
-          = text_field_tag('search_text', params[:search_text], placeholder: 'Search', autofocus: true, required: true, class: 'form-control',
-                           id: 'search_input')
+          = search_field_tag('search_text', params[:search_text], placeholder: 'Search', autofocus: true, required: true, class: 'form-control',
+                             id: 'search_input')
           %button.btn.btn-primary.ms-1{ type: 'submit', title: 'Search' }
             %i.fa.fa-search
         .row
diff --git a/src/api/app/views/webui/shared/_autocomplete.html.haml b/src/api/app/views/webui/shared/_autocomplete.html.haml
index 76b58873e57..0ffde1ba19d 100644
--- a/src/api/app/views/webui/shared/_autocomplete.html.haml
+++ b/src/api/app/views/webui/shared/_autocomplete.html.haml
@@ -14,5 +14,5 @@
   .input-group
     %span.input-group-text
       %i.fas.fa-search
-    = text_field_tag(html_id, value, required: required, disabled: disabled, placeholder: 'Type to autocomplete...',
-                     class: 'obs-autocomplete form-control', data: data, name: html_name)
+    = search_field_tag(html_id, value, required: required, disabled: disabled, placeholder: 'Type to autocomplete...',
+                       class: 'obs-autocomplete form-control', data: data, name: html_name)
diff --git a/src/api/app/views/webui/shared/bs_requests/_requests_filter.html.haml b/src/api/app/views/webui/shared/bs_requests/_requests_filter.html.haml
index 1feeb6f7a6c..b9cf6c2d7bf 100644
--- a/src/api/app/views/webui/shared/bs_requests/_requests_filter.html.haml
+++ b/src/api/app/views/webui/shared/bs_requests/_requests_filter.html.haml
@@ -105,7 +105,7 @@
       .selected-content.small.ms-1
     .px-4.pb-2.accordion-collapse.collapse.show#request-filter-stag-proj
       .mb-3.ui-front
-        %input.form-control#stag-proj-search{ placeholder: 'Filter staging project' }
+        %input.form-control#stag-proj-search{ placeholder: 'Filter staging project', type: 'search' }
       .scroll-list-wrapper
         - Project.where.not(staging_workflow_id: nil).each do |sp|
           .dropdown-item-text.request-filter-stag-proj-item
diff --git a/src/api/app/views/webui/user/_involvement.html.haml b/src/api/app/views/webui/user/_involvement.html.haml
index 22624ba122c..8de3aa25366 100644
--- a/src/api/app/views/webui/user/_involvement.html.haml
+++ b/src/api/app/views/webui/user/_involvement.html.haml
@@ -17,7 +17,7 @@
     .card-body
       = form_with(model: displayed_user, method: :get, local: true, class: 'row row-cols-auto justify-content-end') do
         .mb-3
-          %input.form-control{ 'aria-label': 'Search', name: 'search_text', placeholder: 'Search', type: 'text', value: filters[:search_text] }
+          %input.form-control{ 'aria-label': 'Search', name: 'search_text', placeholder: 'Search', type: 'search', value: filters[:search_text] }
         %span.dropdown.mb-3#involved-project-package
           %button.btn.btn-outline-secondary.dropdown-toggle.form-control{ data: { 'bs-toggle': :dropdown }, type: :button }
             %span.caret