diff --git a/doc/changelog.d/788.fixed.md b/doc/changelog.d/788.fixed.md
new file mode 100644
index 000000000..df37a07c3
--- /dev/null
+++ b/doc/changelog.d/788.fixed.md
@@ -0,0 +1 @@
+Rearrange search import
diff --git a/src/ansys_sphinx_theme/theme/ansys_sphinx_theme/layout.html b/src/ansys_sphinx_theme/theme/ansys_sphinx_theme/layout.html
index efe13b456..5ec9539dc 100644
--- a/src/ansys_sphinx_theme/theme/ansys_sphinx_theme/layout.html
+++ b/src/ansys_sphinx_theme/theme/ansys_sphinx_theme/layout.html
@@ -12,6 +12,9 @@
   <meta name="physics" content="{{ pyansys_tags }}" />
     {%- endif %}
   {%- endif %}
+  {% if theme_use_ansys_search %}
+    {%- include "components/ast-search-button.html" %}
+  {%  endif %}
 {%- endblock %}
 
 {# Append our custom CSS after the bootstrap stylesheet so we can override where necessary #}
@@ -40,13 +43,6 @@
   {% endif %}
 {% endblock %}
 
-{%- block content %}
-  {{ super() }}
-  {% if theme_use_ansys_search %}
-    {%- include "components/ast-search-button.html" %}
-  {%  endif %}
-{%- endblock %}
-
 {%- block scripts_end %}
   {{ super() }}
 
diff --git a/src/ansys_sphinx_theme/theme/ansys_sphinx_theme/search.html b/src/ansys_sphinx_theme/theme/ansys_sphinx_theme/search.html
index c1e1aa57c..a7f8f1357 100644
--- a/src/ansys_sphinx_theme/theme/ansys_sphinx_theme/search.html
+++ b/src/ansys_sphinx_theme/theme/ansys_sphinx_theme/search.html
@@ -21,8 +21,8 @@ <h1>{{ _("Search") }}</h1>
   <div class="results" id="search-results"></div>
 </div>
 
-<script src="https://cdnjs.cloudflare.com/ajax/libs/require.js/2.3.6/require.min.js"></script>
-<script src="{{ pathto('_static/js/search-main.js', 1) }}"></script>
+<!-- <script src="https://cdnjs.cloudflare.com/ajax/libs/require.js/2.3.6/require.min.js"></script> -->
+<!-- <script src="{{ pathto('_static/js/search-main.js', 1) }}"></script> -->
 
 {% endblock %}
 
@@ -30,3 +30,7 @@ <h1>{{ _("Search") }}</h1>
   <title>{{ _("Search") }} - {{ title or docstitle }}</title>
 {%- endblock htmltitle -%}
 
+{%- block scripts_end %}
+<!-- <script src="https://cdnjs.cloudflare.com/ajax/libs/require.js/2.3.6/require.min.js"></script> -->
+<script src="{{ pathto('_static/js/search-main.js', 1) }}"></script>
+{%- endblock %}