diff --git a/src/NuGetGallery/Scripts/nugetgallery.js b/src/NuGetGallery/Scripts/nugetgallery.js
index de26b1d72a..1ea9f74698 100644
--- a/src/NuGetGallery/Scripts/nugetgallery.js
+++ b/src/NuGetGallery/Scripts/nugetgallery.js
@@ -2,6 +2,11 @@
 /// <reference path="jquery-1.6.4.js" />
 (function (window, $, undefined) {
     function attachSearchBoxBehavior($input, $menu) {
+        if ($input.length == 0 || $menu.length == 0) {
+            // If we were given nothing, just return.
+            return;
+        }
+
         // Remember the previous state in order to perform smooth animation transforms
         var prevstate = false;
         function popit(assumeFocused) {
@@ -72,7 +77,7 @@
         // Get the service status
         checkServiceStatus();
 
-        attachSearchBoxBehavior($('#searchBoxInput'), $('#menu'));
+        attachSearchBoxBehavior($('#searchBoxInput.expanding-search'), $('#menu.expanding-search'));
     });
 
 	// Add validator that ensures provided value is NOT equal to a specified value.
diff --git a/src/NuGetGallery/Views/Shared/Layout.cshtml b/src/NuGetGallery/Views/Shared/Layout.cshtml
index 361d77108c..c5d5456a4f 100644
--- a/src/NuGetGallery/Views/Shared/Layout.cshtml
+++ b/src/NuGetGallery/Views/Shared/Layout.cshtml
@@ -21,7 +21,7 @@
                     @Html.Partial(MVC.Shared.Views.UserDisplay)
                 </header>
                 <nav class="main">
-                    <ul id="menu">
+                    <ul id="menu" class="expanding-search">
                         @{
                             var homeClass = ViewBag.Tab == "Home" ? "current" : "";
                             var packagesClass = ViewBag.Tab == "Packages" ? "current" : "";
@@ -45,7 +45,7 @@
                     </ul>
                     <div id="searchBox" role="search">
                         <form action="@Url.PackageList()" method="get">
-                            <input name="q" id="searchBoxInput" placeholder="Search Packages" value="@(String.IsNullOrEmpty(ViewBag.SearchTerm) ? "" : ViewBag.SearchTerm)" />
+                            <input name="q" id="searchBoxInput" class="expanding-search" placeholder="Search Packages" value="@(String.IsNullOrEmpty(ViewBag.SearchTerm) ? "" : ViewBag.SearchTerm)" />
                             <input id="searchBoxSubmit" type="submit" value=" " />
                         </form>
                     </div>