diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
index 2824cbf3ef..7f80cbc4ed 100644
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -725,6 +725,7 @@ phutil_register_library_map(array(
     'PhabricatorApplicationReleeph' => 'applications/releeph/application/PhabricatorApplicationReleeph.php',
     'PhabricatorApplicationReleephConfigOptions' => 'applications/releeph/config/PhabricatorApplicationReleephConfigOptions.php',
     'PhabricatorApplicationRepositories' => 'applications/repository/application/PhabricatorApplicationRepositories.php',
+    'PhabricatorApplicationSearch' => 'applications/search/application/PhabricatorApplicationSearch.php',
     'PhabricatorApplicationSearchEngine' => 'applications/search/engine/PhabricatorApplicationSearchEngine.php',
     'PhabricatorApplicationSettings' => 'applications/settings/application/PhabricatorApplicationSettings.php',
     'PhabricatorApplicationSlowvote' => 'applications/slowvote/application/PhabricatorApplicationSlowvote.php',
@@ -963,7 +964,6 @@ phutil_register_library_map(array(
     'PhabricatorFeedStoryReference' => 'applications/feed/storage/PhabricatorFeedStoryReference.php',
     'PhabricatorFeedStoryStatus' => 'applications/feed/story/PhabricatorFeedStoryStatus.php',
     'PhabricatorFeedStoryTypeConstants' => 'applications/feed/constants/PhabricatorFeedStoryTypeConstants.php',
-    'PhabricatorFeedStoryView' => 'applications/feed/view/PhabricatorFeedStoryView.php',
     'PhabricatorFeedView' => 'applications/feed/view/PhabricatorFeedView.php',
     'PhabricatorFile' => 'applications/files/storage/PhabricatorFile.php',
     'PhabricatorFileController' => 'applications/files/controller/PhabricatorFileController.php',
@@ -2422,6 +2422,7 @@ phutil_register_library_map(array(
     'PhabricatorApplicationReleeph' => 'PhabricatorApplication',
     'PhabricatorApplicationReleephConfigOptions' => 'PhabricatorApplicationConfigOptions',
     'PhabricatorApplicationRepositories' => 'PhabricatorApplication',
+    'PhabricatorApplicationSearch' => 'PhabricatorApplication',
     'PhabricatorApplicationSettings' => 'PhabricatorApplication',
     'PhabricatorApplicationSlowvote' => 'PhabricatorApplication',
     'PhabricatorApplicationStatusView' => 'AphrontView',
@@ -2662,7 +2663,6 @@ phutil_register_library_map(array(
     'PhabricatorFeedStoryReference' => 'PhabricatorFeedDAO',
     'PhabricatorFeedStoryStatus' => 'PhabricatorFeedStory',
     'PhabricatorFeedStoryTypeConstants' => 'PhabricatorFeedConstants',
-    'PhabricatorFeedStoryView' => 'PhabricatorFeedView',
     'PhabricatorFeedView' => 'AphrontView',
     'PhabricatorFile' =>
     array(
diff --git a/src/aphront/configuration/AphrontDefaultApplicationConfiguration.php b/src/aphront/configuration/AphrontDefaultApplicationConfiguration.php
index 84f4a027b6..94813a1902 100644
--- a/src/aphront/configuration/AphrontDefaultApplicationConfiguration.php
+++ b/src/aphront/configuration/AphrontDefaultApplicationConfiguration.php
@@ -73,18 +73,6 @@ class AphrontDefaultApplicationConfiguration
         'data/(?P<key>[^/]+)/' => 'DarkConsoleDataController',
       ),
 
-      '/search/' => array(
-        '' => 'PhabricatorSearchController',
-        '(?P<key>[^/]+)/' => 'PhabricatorSearchController',
-        'attach/(?P<phid>[^/]+)/(?P<type>\w+)/(?:(?P<action>\w+)/)?'
-          => 'PhabricatorSearchAttachController',
-        'select/(?P<type>\w+)/'
-          => 'PhabricatorSearchSelectController',
-        'index/(?P<phid>[^/]+)/' => 'PhabricatorSearchIndexController',
-        'hovercard/(?P<mode>retrieve|test)/' =>
-          'PhabricatorSearchHovercardController',
-      ),
-
       '/status/' => 'PhabricatorStatusController',
 
 
diff --git a/src/applications/search/application/PhabricatorApplicationSearch.php b/src/applications/search/application/PhabricatorApplicationSearch.php
new file mode 100644
index 0000000000..06bf280e3a
--- /dev/null
+++ b/src/applications/search/application/PhabricatorApplicationSearch.php
@@ -0,0 +1,41 @@
+<?php
+
+final class PhabricatorApplicationSearch extends PhabricatorApplication {
+
+  public function getBaseURI() {
+    return '/search/';
+  }
+
+  public function getName() {
+    return pht('Search');
+  }
+
+  public function getShortDescription() {
+    return pht('Search & Find');
+  }
+
+  public function getFlavorText() {
+    return pht('Find stuff in big piles.');
+  }
+
+  public function shouldAppearInLaunchView() {
+    return false;
+  }
+
+  public function getRoutes() {
+    return array(
+      '/search/' => array(
+        '' => 'PhabricatorSearchController',
+        '(?P<key>[^/]+)/' => 'PhabricatorSearchController',
+        'attach/(?P<phid>[^/]+)/(?P<type>\w+)/(?:(?P<action>\w+)/)?'
+          => 'PhabricatorSearchAttachController',
+        'select/(?P<type>\w+)/'
+          => 'PhabricatorSearchSelectController',
+        'index/(?P<phid>[^/]+)/' => 'PhabricatorSearchIndexController',
+        'hovercard/(?P<mode>retrieve|test)/' =>
+          'PhabricatorSearchHovercardController',
+      ),
+    );
+  }
+
+}