diff --git a/addons/portal/static/src/js/portal.js b/addons/portal/static/src/js/portal.js
index 610e58b505f..183f383b4ed 100644
--- a/addons/portal/static/src/js/portal.js
+++ b/addons/portal/static/src/js/portal.js
@@ -96,9 +96,8 @@ publicWidget.registry.PortalHomeCounters = publicWidget.Widget.extend({
 publicWidget.registry.portalSearchPanel = publicWidget.Widget.extend({
     selector: '.o_portal_search_panel',
     events: {
-        'click .search-submit': '_onSearchSubmitClick',
         'click .dropdown-item': '_onDropdownItemClick',
-        'keyup input[name="search"]': '_onSearchInputKeyup',
+        'submit': '_onSubmit',
     },
 
     /**
@@ -136,12 +135,6 @@ publicWidget.registry.portalSearchPanel = publicWidget.Widget.extend({
     // Handlers
     //--------------------------------------------------------------------------
 
-    /**
-     * @private
-     */
-    _onSearchSubmitClick: function () {
-        this._search();
-    },
     /**
      * @private
      */
@@ -156,10 +149,9 @@ publicWidget.registry.portalSearchPanel = publicWidget.Widget.extend({
     /**
      * @private
      */
-    _onSearchInputKeyup: function (ev) {
-        if (ev.keyCode === $.ui.keyCode.ENTER) {
-            this._search();
-        }
+    _onSubmit: function (ev) {
+        ev.preventDefault();
+        this._search();
     },
 });
 
diff --git a/addons/portal/views/portal_templates.xml b/addons/portal/views/portal_templates.xml
index 8381af7612d..cd810614967 100644
--- a/addons/portal/views/portal_templates.xml
+++ b/addons/portal/views/portal_templates.xml
@@ -310,7 +310,7 @@
                         </div>
                         <input type="text" class="form-control form-control-sm" placeholder="Search" t-att-value='search' name="search"/>
                         <span class="input-group-append">
-                            <button class="btn btn-secondary search-submit" type="button">
+                            <button class="btn btn-secondary o_wait_lazy_js" type="submit">
                                 <span class="fa fa-search"/>
                             </button>
                         </span>