diff --git a/src/invidious/routes/before_all.cr b/src/invidious/routes/before_all.cr
index 90958934..841bbab2 100644
--- a/src/invidious/routes/before_all.cr
+++ b/src/invidious/routes/before_all.cr
@@ -150,7 +150,9 @@ module Invidious::Routes::BeforeAll
                  "popular"
                when "/feed/trending", "/api/v1/trending"
                  "trending"
-               when "/search", "/api/v1/search"
+               when "/search", "/api/v1/search", "/api/v1/search/suggestions", "/results"
+                 "search"
+               when .starts_with?("/hashtag/"), .starts_with?("/api/v1/hashtag/")
                  "search"
                else
                  nil
diff --git a/src/invidious/views/search_homepage.ecr b/src/invidious/views/search_homepage.ecr
index 2424a1cf..f651dc5c 100644
--- a/src/invidious/views/search_homepage.ecr
+++ b/src/invidious/views/search_homepage.ecr
@@ -12,9 +12,11 @@
     <div class="pure-u-1" id="logo">
         <h1 href="/" class="pure-menu-heading">Invidious</h1>
     </div>
+    <% if CONFIG.page_enabled?("search") %>
     <div class="pure-u-1-4"></div>
     <div class="pure-u-1 pure-u-md-12-24 searchbar">
         <% autofocus = true %><%= rendered "components/search_box" %>
     </div>
     <div class="pure-u-1-4"></div>
+    <% end %>
 </div>
diff --git a/src/invidious/views/template.ecr b/src/invidious/views/template.ecr
index 40f5544f..9aa45e68 100644
--- a/src/invidious/views/template.ecr
+++ b/src/invidious/views/template.ecr
@@ -31,13 +31,17 @@
     <div class="pure-g">
         <div class="pure-u-1 pure-u-xl-20-24" id="contents">
             <div class="pure-g navbar h-box">
-                <% if navbar_search %>
+                <% if navbar_search && CONFIG.page_enabled?("search") %>
                     <div class="pure-u-1 pure-u-md-4-24">
                         <a href="/" class="index-link pure-menu-heading">Invidious</a>
                     </div>
                     <div class="pure-u-1 pure-u-md-12-24 searchbar">
                         <% autofocus = false %><%= rendered "components/search_box" %>
                     </div>
+                <% elsif navbar_search %>
+                    <div class="pure-u-1 pure-u-md-16-24">
+                        <a href="/" class="index-link pure-menu-heading">Invidious</a>
+                    </div>
                 <% end %>
 
                 <div class="pure-u-1 pure-u-md-8-24 user-field">