diff --git a/src/applications/search/controller/PhabricatorSearchController.php b/src/applications/search/controller/PhabricatorSearchController.php
--- a/src/applications/search/controller/PhabricatorSearchController.php
+++ b/src/applications/search/controller/PhabricatorSearchController.php
@@ -39,6 +39,11 @@
     // with only this piece of somewhat-sketchy code. See discussion in T4365.
 
     if ($request->getBool('search:primary')) {
+      if (!strlen($request->getStr('query'))) {
+        $advanced_uri = '/search/query/advanced/';
+        return id(new AphrontRedirectResponse())->setURI($advanced_uri);
+      }
+
       $named_queries = $engine->loadEnabledNamedQueries();
       if ($named_queries) {
         $named = head($named_queries);