diff --git a/www/extras/admin/admin.css b/www/extras/admin/admin.css
index afa050ce4..6f9c862b6 100644
--- a/www/extras/admin/admin.css
+++ b/www/extras/admin/admin.css
@@ -5,6 +5,11 @@
 
 html,body { margin: 0; padding: 0; height: 100% }
 
+input.disabled {
+    font-style: italic;
+    color: #555;
+}
+
 #wrapper {
     position: relative;
     margin-left: 165px; /* move out of the adminbar's way */
@@ -107,7 +112,8 @@ html,body { margin: 0; padding: 0; height: 100% }
     width: 99%;
     height: 90%;
     border: none;
-    font: 14px Verdana, sans-serif;
+    font-size: 14px;
+    font-family: Verdana, sans-serif;
 }
 
 #locationBar #locationTitle {
diff --git a/www/extras/admin/admin.js b/www/extras/admin/admin.js
index ea3148b98..562d4866c 100644
--- a/www/extras/admin/admin.js
+++ b/www/extras/admin/admin.js
@@ -1057,13 +1057,23 @@ WebGUI.Admin.LocationBar.prototype.goHome
  */
 WebGUI.Admin.LocationBar.prototype.toggleSearchDialog
 = function ( ) {
+    var input = document.getElementById( 'locationInput' );
     if ( this.searchDialog == true ) {
         this.hideSearchDialog();
         this.searchDialog = false;
+        input.value = this.savedLocationInput;
+        this.savedLocationInput = "";
+        input.readonly = false;
+        YAHOO.util.Dom.removeClass( input, 'disabled' );
     }
     else {
         this.showSearchDialog();
         this.searchDialog = true;
+        this.savedLocationInput = input.value;
+        input.value = "";
+        this.updateLocationBarQuery();
+        input.readonly = true;
+        YAHOO.util.Dom.addClass( input, 'disabled' );
     }
 };