diff --git a/src/applications/search/controller/select/PhabricatorSearchSelectController.php b/src/applications/search/controller/select/PhabricatorSearchSelectController.php
index a5ddd9d09f..0d11a702d7 100644
--- a/src/applications/search/controller/select/PhabricatorSearchSelectController.php
+++ b/src/applications/search/controller/select/PhabricatorSearchSelectController.php
@@ -51,8 +51,8 @@ class PhabricatorSearchSelectController
         break;
     }
 
-    $exec = new PhabricatorSearchMySQLExecutor();
-    $results = $exec->executeSearch($query);
+    $engine = PhabricatorSearchEngineSelector::newSelector()->newEngine();
+    $results = $engine->executeSearch($query);
 
     $phids = array_fill_keys(ipull($results, 'phid'), true);
     $phids += $this->queryObjectNames($query_str);
diff --git a/src/applications/search/controller/select/__init__.php b/src/applications/search/controller/select/__init__.php
index 95f2186d5d..01924ab54a 100644
--- a/src/applications/search/controller/select/__init__.php
+++ b/src/applications/search/controller/select/__init__.php
@@ -13,7 +13,7 @@ phutil_require_module('phabricator', 'applications/phid/constants');
 phutil_require_module('phabricator', 'applications/phid/handle/data');
 phutil_require_module('phabricator', 'applications/phid/handle/view/selector');
 phutil_require_module('phabricator', 'applications/search/controller/search');
-phutil_require_module('phabricator', 'applications/search/execute/mysql');
+phutil_require_module('phabricator', 'applications/search/selector/base');
 phutil_require_module('phabricator', 'applications/search/storage/query');
 
 phutil_require_module('phutil', 'utils');