diff --git a/templates/zerver/app/navbar.html b/templates/zerver/app/navbar.html
index c08ebd0d5e..2bbce68007 100644
--- a/templates/zerver/app/navbar.html
+++ b/templates/zerver/app/navbar.html
@@ -44,6 +44,7 @@
                         <span id="streamlist-toggle-unreadcount">0</span>
                     </a>
                 </div>
+                {% if search_pills_enabled %}
                 <div id="searchbox" class="searchbox-rightmargin">
                     <div id="tab_bar" class="notdisplayed">
                     </div>
@@ -56,7 +57,22 @@
                             <a class="search_icon" href="#search-operators" data-overlay-trigger="search-operators" title="{{ _('Search help') }}"><i class="fa fa-search" aria-hidden="true"></i></a>
                         </div>
                     </form>
-                </div>{# /searchbox #}
+                </div>
+                {% else %}
+                <div id="searchbox" class="searchbox-rightmargin">
+                    <div id="tab_bar" class="notdisplayed">
+                    </div>
+                    <form id="searchbox_form" class="form-search navbar-search">
+                        <div id="search_arrows" class="input-append">
+                            <input class="search-query input-block-level" id="search_query" type="text" placeholder="{{ _('Search') }}"
+                              autocomplete="off" aria-label="{{ _('Search') }}" title="{{ _('Search') }} (/)"/>
+                            {# Start the button off disabled since there is no active search #}
+                            <button class="btn search_button" type="button" id="search_exit" disabled="disabled" aria-label="{{ _('Exit search') }}"><i class="fa fa-remove" aria-hidden="true"></i></button>
+                            <a class="search_icon" href="#search-operators" data-overlay-trigger="search-operators" title="{{ _('Search help') }}"><i class="fa fa-search" aria-hidden="true"></i></a>
+                        </div>
+                    </form>
+                </div>
+                {% endif %}
             </div>
         </div>
         <div class="column-right">
diff --git a/tools/check-templates b/tools/check-templates
index 273b5369e1..78d127386b 100755
--- a/tools/check-templates
+++ b/tools/check-templates
@@ -66,6 +66,13 @@ def check_html_templates(templates, all_dups):
             'send_confirm',
             'register',
             'footer',
+            # Temporary while we have searchbox forked
+            'search_exit',
+            'search_query',
+            'tab_bar',
+            'search_arrows',
+            'searchbox_form',
+            'searchbox',
         ]
         bad_ids_dict = {ids: fns for ids, fns in template_id_dict.items()
                         if (ids not in IGNORE_IDS) and len(fns) > 1}
diff --git a/zerver/views/home.py b/zerver/views/home.py
index 02f11b7e4f..7acd1e16cb 100644
--- a/zerver/views/home.py
+++ b/zerver/views/home.py
@@ -265,6 +265,7 @@ def home_real(request: HttpRequest) -> HttpResponse:
                                'show_debug':
                                settings.DEBUG and ('show_debug' in request.GET),
                                'pipeline': settings.PIPELINE_ENABLED,
+                               'search_pills_enabled': settings.SEARCH_PILLS_ENABLED,
                                'show_invites': show_invites,
                                'is_admin': user_profile.is_realm_admin,
                                'is_guest': user_profile.is_guest,