diff --git a/lib/action.php b/lib/action.php
index 251b1dadac..38685f928a 100644
--- a/lib/action.php
+++ b/lib/action.php
@@ -580,8 +580,6 @@ class Action extends HTMLOutputter // lawsuit
     function showPrimaryNav()
     {
         $this->elementStart('div', array('id' => 'site_nav_global_primary'));
-        $pn = new PrimaryNav($this);
-        $pn->show();
 
         $user = common_current_user();
 
@@ -590,6 +588,8 @@ class Action extends HTMLOutputter // lawsuit
             $form->show();
         }
 
+        $pn = new PrimaryNav($this);
+        $pn->show();
         $this->elementEnd('div');
     }
 
diff --git a/lib/searchform.php b/lib/searchform.php
index b58d7af809..4c63264006 100644
--- a/lib/searchform.php
+++ b/lib/searchform.php
@@ -89,7 +89,7 @@ class SearchForm extends Form
 
     function id()
     {
-        return 'search';
+        return 'header-search';
     }
 
     /**