diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SkinControls/GlobalSearch.ascx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SkinControls/GlobalSearch.ascx
index ced9cc9a..8ac84eba 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SkinControls/GlobalSearch.ascx
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SkinControls/GlobalSearch.ascx
@@ -50,6 +50,10 @@
                 $ImgBtn.attr('disabled', 'disabled');
             }
         });
+        if (document.referrer.search("pid=Login") > 0) {
+            $("#<%= tbSearch.ClientID %>").focus();
+        }
+
     });//]]>
 </script>