diff --git a/_includes/nav.html b/_includes/nav.html
index 5a63da061fb..1aa4dc53a0f 100644
--- a/_includes/nav.html
+++ b/_includes/nav.html
@@ -2,6 +2,12 @@
 <nav class="main-nav">
   <div class="container-lg mx-auto clearfix">
     <div class="float-sm-right">
+      
+      <form class="form-inline my-2 my-lg-0" action="/search" method="get">
+        <input class="form-control mr-sm-2" type="search" placeholder="Search" aria-label="Search" name="query">
+        <button class="btn btn-outline-success my-2 my-sm-0" type="submit">Search</button>
+      </form>
+
       <ul
         class="main-links d-flex flex-wrap flex-items-stretch flex-justify-center border-left border-bottom border-sm-0 list-style-none">
         <li class="d-inline-block border-right">
@@ -32,7 +38,7 @@
           </div>
         </li>
         {% endif %}
-      </ul>
+      </ul>      
     </div>
     {% if page.layout != 'index' %}
     <div class="float-sm-left pl-3 breadcrumb">
@@ -46,4 +52,4 @@
     </div>
     {% endif %}
   </div>
-</nav>
+</nav>
\ No newline at end of file
diff --git a/_layouts/default.html b/_layouts/default.html
index 70e61d7245a..010fc72a303 100644
--- a/_layouts/default.html
+++ b/_layouts/default.html
@@ -5,11 +5,6 @@
 <body>
   <main>
     <div id="content">
-      <!-- Search Form -->
-      <form id="searchForm" onsubmit="return searchSite(event)">
-        <input type="text" id="searchBar" placeholder="Search guides..." />
-        <button type="submit">Search</button>
-      </form>
       <div id="results"></div>
 
       <!-- Main Content -->
