diff --git a/renderer.py b/renderer.py
index 9d58a7c..3bebd50 100644
--- a/renderer.py
+++ b/renderer.py
@@ -581,17 +581,14 @@ def oidc_nav_mobile(user_name, email_address, name):
     """
     return Markup(html_payload)
 
-def render_search(page):
-    if page == "users" or page == "machines":
-        app.logger.info("Rendering search for %s page", page)
-        html_payload = """
-            <form>
-                <div class="input-field">
-                    <input id="search" type="search" required>
-                    <label class="label-icon" for="search"><i class="material-icons">search</i></label>
-                    <i class="material-icons">close</i>
-                </div>
-            </form>
-        """
-        return Markup(html_payload)
-    return Markup("")
\ No newline at end of file
+def render_search():
+    html_payload = """
+        <form>
+            <div class="input-field">
+                <input id="search" type="search" required>
+                <label class="label-icon" for="search"><i class="material-icons">search</i></label>
+                <i class="material-icons">close</i>
+            </div>
+        </form>
+    """
+    return Markup(html_payload)
diff --git a/server.py b/server.py
index 64855ba..3678ed5 100644
--- a/server.py
+++ b/server.py
@@ -171,7 +171,7 @@ def machines_page():
     # Check if OIDC is enabled.  If it is, display the buttons:
     OIDC_NAV_DROPDOWN = Markup("")
     OIDC_NAV_MOBILE = Markup("")
-    INPAGE_SEARCH = Markup(renderer.render_search("machines"))
+    INPAGE_SEARCH = Markup(renderer.render_search())
     if AUTH_TYPE == "oidc":
         email_address = oidc.user_getfield("email")
         user_name     = oidc.user_getfield("preferred_username")
@@ -200,7 +200,7 @@ def users_page():
     # Check if OIDC is enabled.  If it is, display the buttons:
     OIDC_NAV_DROPDOWN = Markup("")
     OIDC_NAV_MOBILE = Markup("")
-    INPAGE_SEARCH = Markup(renderer.render_search("users"))
+    INPAGE_SEARCH = Markup(renderer.render_search()
     if AUTH_TYPE == "oidc":
         email_address = oidc.user_getfield("email")
         user_name     = oidc.user_getfield("preferred_username")
diff --git a/templates/machines.html b/templates/machines.html
index eb351b8..bc31221 100644
--- a/templates/machines.html
+++ b/templates/machines.html
@@ -7,6 +7,8 @@
 
 {% block OIDC_NAV_DROPDOWN %} {{ OIDC_NAV_DROPDOWN}} {% endblock %}
 {% block OIDC_NAV_MOBILE %}   {{ OIDC_NAV_MOBILE  }} {% endblock %}
+{% block INPAGE_SEARCH%}      {{ INPAGE_SEARCH }}    {% endblock %}
+
 
 {% block content %}
 <div class="row"><br>
diff --git a/templates/users.html b/templates/users.html
index 0f7edee..9a71833 100644
--- a/templates/users.html
+++ b/templates/users.html
@@ -7,6 +7,7 @@
 
 {% block OIDC_NAV_DROPDOWN %} {{ OIDC_NAV_DROPDOWN}} {% endblock %}
 {% block OIDC_NAV_MOBILE %}   {{ OIDC_NAV_MOBILE  }} {% endblock %}
+{% block INPAGE_SEARCH%}      {{ INPAGE_SEARCH }}    {% endblock %}
 
 {% block content %}
 <div class="row"><br>