diff --git a/share/xml/header.ent b/share/xml/header.ent
index f9023bcd43..dfcce35a4a 100644
--- a/share/xml/header.ent
+++ b/share/xml/header.ent
@@ -48,8 +48,13 @@
   </div>
 '>
 
-<!ENTITY header2.searchinputs '
-	<div xmlns="http://www.w3.org/1999/xhtml">
+<!ENTITY header2.searchbox '
+  <div id="search" xmlns="http://www.w3.org/1999/xhtml">
+    <form action="&cgibase;/search.cgi" method="get">
+      <div>
+        <h2 class="blockhide"><label for="words">&header2.word.search;</label></h2>
+
+	<div>
             <input type="hidden" name="max" value="25" />
             <input type="hidden" name="source" value="www" />
             <input id="words" name="words" type="text" size="20"
@@ -59,6 +64,9 @@
 	    <span>&nbsp;</span>
             <input id="submit" name="submit" type="submit" value="&header2.word.search;" />
 	</div>
+      </div>
+    </form>
+  </div> <!-- SEARCH -->
 '>
 
 <!ENTITY header2.topnav.label '<h2 xmlns="http://www.w3.org/1999/xhtml" class="blockhide">Site Navigation</h2>'>
@@ -173,18 +181,8 @@
     <div id="headerlogoright">
       &header2.donatebutton;
       &header2.searchnav.label;
-
       &header2.searchnav;
-
-      <div id="search">
-        <form action="&cgibase;/search.cgi" method="get">
-          <div>
-            <h2 class="blockhide"><label for="words">&header2.word.search;</label></h2>
-
-            &header2.searchinputs;
-          </div>
-        </form>
-      </div> <!-- SEARCH -->
+      &header2.searchbox;
     </div> <!-- HEADERLOGORIGHT -->
   </div> <!-- HEADER -->