diff --git a/assets/controllers/elements/part_livesearch_controller.js b/assets/controllers/elements/part_livesearch_controller.js
index e79ed641..e1350172 100644
--- a/assets/controllers/elements/part_livesearch_controller.js
+++ b/assets/controllers/elements/part_livesearch_controller.js
@@ -59,6 +59,9 @@ export default class extends Controller {
         //The URL of the placeholder picture
         const placeholder_image = this.element.dataset.placeholderImage;
 
+        //If the element is in navbar mode, or not
+        const navbar_mode = this.element.dataset.navbarMode === "true";
+
         const that = this;
 
         const recentSearchesPlugin = createLocalStorageRecentSearchesPlugin({
@@ -68,8 +71,9 @@ export default class extends Controller {
 
         this._autocomplete = autocomplete({
             container: this.element,
-            panelContainer: document.getElementById("navbar-frame"),
-            panelPlacement: 'end',
+            //Place the panel in the navbar, if the element is in navbar mode
+            panelContainer: navbar_mode ? document.getElementById("navbar-frame") : document.body,
+            panelPlacement: this.element.dataset.panelPlacement,
             plugins: [recentSearchesPlugin],
             openOnFocus: true,
             placeholder: trans(SEARCH_PLACEHOLDER),
diff --git a/templates/_navbar.html.twig b/templates/_navbar.html.twig
index 2ae97371..0d775b8d 100644
--- a/templates/_navbar.html.twig
+++ b/templates/_navbar.html.twig
@@ -1,4 +1,5 @@
 {% import "helper.twig" as helper %}
+{% import "components/search.macro.html.twig" as search %}
 
 <nav class="navbar navbar-expand-md bg-body-tertiary border-bottom shadow-sm fixed-top py-0" id="navbar">
     <div class="container-fluid">
@@ -58,7 +59,9 @@
             </ul>
 
             {% if is_granted('@parts.read') %}
-                {% include "_navbar_search.html.twig" %}
+                {{ search.search_form("navbar") }}
+
+            {# {% include "_navbar_search.html.twig" %} #}
             {% endif %}
 
 
diff --git a/templates/_navbar_search.html.twig b/templates/components/search.macro.html.twig
similarity index 76%
rename from templates/_navbar_search.html.twig
rename to templates/components/search.macro.html.twig
index 4b954b62..f85b133c 100644
--- a/templates/_navbar_search.html.twig
+++ b/templates/components/search.macro.html.twig
@@ -1,7 +1,8 @@
-<form id="navbar-search-form" action="{{ path('parts_search') }}" class="d-flex my-lg-0 ms-auto" method="get" data-turbo-permanent>
+{% macro settings_drodown(show_label_instead_icon = true) %}
+
     <div class="dropdown">
         <button class="btn dropdown-toggle my-2" type="button" id="navbar-search-options" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false" data-bs-auto-close="false">
-            {% trans %}search.options.label{% endtrans %}
+            {% if show_label_instead_icon %}{% trans %}search.options.label{% endtrans %}{% else %}<i class="fa-solid fa-gear"></i>{% endif %}
             <span class="caret"></span>
         </button>
         <div class="dropdown-menu" aria-labelledby="navbar-search-options">
@@ -68,11 +69,37 @@
             </div>
         </div>
     </div>
+{% endmacro %}
 
-    {# It is important that this element has an id field. Otherwise the dropdown panel wont appear after some link clicks #}
-    <div {{ stimulus_controller('elements/part_livesearch') }} class="mt-auto mb-auto" id="navbar-quicksearch-container"
-                                                               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') }}>
-    </div>
-</form>
\ No newline at end of file
+{# Render a complete usable search form including the form tags. mode can be "standalone" or "navbar" #}
+{% macro search_form(mode = "standalone") %}
+    {% set is_navbar = (mode == "navbar") %}
+
+    <form action="{{ path('parts_search') }}" class="d-flex {% if is_navbar %}my-lg-0{% endif%} ms-auto" method="get"
+            {# Navbar element needs to be persistent #}
+            {% if is_navbar %}id="navbar-search-form" data-turbo-permanent{% endif %}>
+
+        {# Show the options left in navbar #}
+        {% if is_navbar %}
+            {{ _self.settings_drodown(is_navbar) }}
+        {% endif %}
+
+        <div {{ stimulus_controller('elements/part_livesearch') }}
+                class="mt-auto mb-auto {% if not is_navbar %}w-100{% endif %}"
+                {% 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-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') }}>
+        </div>
+
+        {# And right in the standalone mode #}
+        {% if not is_navbar %}
+            {{ _self.settings_drodown(is_navbar) }}
+        {% endif %}
+    </form>
+{% endmacro %}
\ No newline at end of file
diff --git a/templates/homepage.html.twig b/templates/homepage.html.twig
index f711b227..4b6cc1ed 100644
--- a/templates/homepage.html.twig
+++ b/templates/homepage.html.twig
@@ -1,19 +1,19 @@
 {% extends "base.html.twig" %}
 
 {% import "components/new_version.macro.html.twig" as nv %}
+{% import "components/search.macro.html.twig" as search %}
 
 {% block content %}
 
-
-    <div id="tessdgjds" {{ stimulus_controller('elements/part_livesearch') }} class="mb-2"
-           data-autocomplete="{{ path('typeahead_parts', {'query': '__QUERY__'}) }}" data-detail-url="{{ path('part_info', {'id': '__ID__'}) }}">
-    </div>
-
-
     {% if is_granted('@system.show_updates') %}
         {{ nv.new_version_alert(new_version_available, new_version, new_version_url) }}
     {% endif %}
 
+    {% if is_granted('@parts.read') %}
+        {{ search.search_form("standalone") }}
+    {% endif %}
+
+
     <div class="rounded p-4 bg-body-secondary">
         <h1 class="display-3">{{ partdb_title }}</h1>
         <h4>