diff --git a/src/applications/search/engine/PhabricatorApplicationSearchEngine.php b/src/applications/search/engine/PhabricatorApplicationSearchEngine.php
index 6122e66e23..f4c460ce34 100644
--- a/src/applications/search/engine/PhabricatorApplicationSearchEngine.php
+++ b/src/applications/search/engine/PhabricatorApplicationSearchEngine.php
@@ -324,6 +324,9 @@ abstract class PhabricatorApplicationSearchEngine extends Phobject {
 
     $result = $head + $body + $tail;
 
+    // Force the fulltext "query" field to the top unconditionally.
+    $result = array_select_keys($result, array('query')) + $result;
+
     foreach ($this->getHiddenFields() as $hidden_key) {
       unset($result[$hidden_key]);
     }
diff --git a/src/applications/search/engineextension/PhabricatorFerretSearchEngineExtension.php b/src/applications/search/engineextension/PhabricatorFerretSearchEngineExtension.php
index 02aadf7336..65822b0a32 100644
--- a/src/applications/search/engineextension/PhabricatorFerretSearchEngineExtension.php
+++ b/src/applications/search/engineextension/PhabricatorFerretSearchEngineExtension.php
@@ -6,7 +6,7 @@ final class PhabricatorFerretSearchEngineExtension
   const EXTENSIONKEY = 'ferret';
 
   public function isExtensionEnabled() {
-    return PhabricatorEnv::getEnvConfig('phabricator.show-prototypes');
+    return true;
   }
 
   public function getExtensionName() {
@@ -56,7 +56,7 @@ final class PhabricatorFerretSearchEngineExtension
 
     $fields[] = id(new PhabricatorSearchTextField())
       ->setKey('query')
-      ->setLabel(pht('Query (Prototype)'))
+      ->setLabel(pht('Query'))
       ->setDescription(pht('Fulltext search.'));
 
     return $fields;