diff --git a/assets/controllers/elements/part_search_controller.js b/assets/controllers/elements/part_search_controller.js
index f4817ea5..4a70c6d2 100644
--- a/assets/controllers/elements/part_search_controller.js
+++ b/assets/controllers/elements/part_search_controller.js
@@ -42,6 +42,7 @@ export default class extends Controller {
 
     _autocomplete;
 
+    // Highlight the search query in the results
     _highlight = (text, query) => {
         if (!text) return text;
         if (!query) return text;
@@ -77,7 +78,7 @@ export default class extends Controller {
         this._autocomplete = autocomplete({
             container: this.element,
             //Place the panel in the navbar, if the element is in navbar mode
-            panelContainer: navbar_mode ? document.getElementById("navbar-frame") : document.body,
+            panelContainer: navbar_mode ? document.getElementById("navbar-search-form") : document.body,
             panelPlacement: this.element.dataset.panelPlacement,
             plugins: [recentSearchesPlugin],
             openOnFocus: true,
diff --git a/templates/components/search.macro.html.twig b/templates/components/search.macro.html.twig
index 5086d7a1..9e9185bf 100644
--- a/templates/components/search.macro.html.twig
+++ b/templates/components/search.macro.html.twig
@@ -89,12 +89,12 @@
                 {% if is_navbar %}id="navbar-quicksearch-container"{% endif %}
 
                 data-panel-placement="{% if is_navbar %}end{% else %}input-wrapper-width{% endif %}"
-                data-mode-navbar="{% if is_navbar %}true{% else %}false{% endif %}"
+                data-navbar-mode="{% if is_navbar %}true{% else %}false{% endif %}"
                 data-placeholder-image="{{ asset('img/part_placeholder.svg') }}"
                 data-autocomplete="{{ path('typeahead_parts', {'query': '__QUERY__'}) }}"
                 data-detail-url="{{ path('part_info', {'id': '__ID__'}) }}">
 
-            <input type="hidden" name="keyword" required {{ stimulus_target('elements/part_livesearch', 'input') }}>
+            <input type="hidden" name="keyword" required {{ stimulus_target('elements/part_search', 'input') }}>
         </div>
 
         {# And right in the standalone mode #}
diff --git a/templates/homepage.html.twig b/templates/homepage.html.twig
index 4b6cc1ed..fa629c41 100644
--- a/templates/homepage.html.twig
+++ b/templates/homepage.html.twig
@@ -11,6 +11,7 @@
 
     {% if is_granted('@parts.read') %}
         {{ search.search_form("standalone") }}
+        <div class="mb-2"></div>
     {% endif %}