diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
index de4c0d3791..009fd4f696 100644
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -3328,6 +3328,7 @@ phutil_register_library_map(array(
     'PhabricatorExternalAccountIdentifierQuery' => 'applications/auth/query/PhabricatorExternalAccountIdentifierQuery.php',
     'PhabricatorExternalAccountQuery' => 'applications/auth/query/PhabricatorExternalAccountQuery.php',
     'PhabricatorExternalAccountsSettingsPanel' => 'applications/settings/panel/PhabricatorExternalAccountsSettingsPanel.php',
+    'PhabricatorExternalEditorSettingsPanel' => 'applications/settings/panel/PhabricatorExternalEditorSettingsPanel.php',
     'PhabricatorExtraConfigSetupCheck' => 'applications/config/check/PhabricatorExtraConfigSetupCheck.php',
     'PhabricatorFacebookAuthProvider' => 'applications/auth/provider/PhabricatorFacebookAuthProvider.php',
     'PhabricatorFact' => 'applications/fact/fact/PhabricatorFact.php',
@@ -9794,6 +9795,7 @@ phutil_register_library_map(array(
     'PhabricatorExternalAccountIdentifierQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
     'PhabricatorExternalAccountQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
     'PhabricatorExternalAccountsSettingsPanel' => 'PhabricatorSettingsPanel',
+    'PhabricatorExternalEditorSettingsPanel' => 'PhabricatorEditEngineSettingsPanel',
     'PhabricatorExtraConfigSetupCheck' => 'PhabricatorSetupCheck',
     'PhabricatorFacebookAuthProvider' => 'PhabricatorOAuth2AuthProvider',
     'PhabricatorFact' => 'Phobject',
diff --git a/src/applications/settings/panel/PhabricatorExternalEditorSettingsPanel.php b/src/applications/settings/panel/PhabricatorExternalEditorSettingsPanel.php
new file mode 100644
index 0000000000..9e402b1492
--- /dev/null
+++ b/src/applications/settings/panel/PhabricatorExternalEditorSettingsPanel.php
@@ -0,0 +1,24 @@
+<?php
+
+final class PhabricatorExternalEditorSettingsPanel
+  extends PhabricatorEditEngineSettingsPanel {
+
+  const PANELKEY = 'editor';
+
+  public function getPanelName() {
+    return pht('External Editor');
+  }
+
+  public function getPanelMenuIcon() {
+    return 'fa-i-cursor';
+  }
+
+  public function getPanelGroupKey() {
+    return PhabricatorSettingsApplicationsPanelGroup::PANELGROUPKEY;
+  }
+
+  public function isTemplatePanel() {
+    return true;
+  }
+
+}
diff --git a/src/applications/settings/setting/PhabricatorEditorMultipleSetting.php b/src/applications/settings/setting/PhabricatorEditorMultipleSetting.php
index 88e36e55d4..e552b89833 100644
--- a/src/applications/settings/setting/PhabricatorEditorMultipleSetting.php
+++ b/src/applications/settings/setting/PhabricatorEditorMultipleSetting.php
@@ -13,7 +13,7 @@ final class PhabricatorEditorMultipleSetting
   }
 
   public function getSettingPanelKey() {
-    return PhabricatorDisplayPreferencesSettingsPanel::PANELKEY;
+    return PhabricatorExternalEditorSettingsPanel::PANELKEY;
   }
 
   protected function getSettingOrder() {
diff --git a/src/applications/settings/setting/PhabricatorEditorSetting.php b/src/applications/settings/setting/PhabricatorEditorSetting.php
index 818a33a001..fcc121334b 100644
--- a/src/applications/settings/setting/PhabricatorEditorSetting.php
+++ b/src/applications/settings/setting/PhabricatorEditorSetting.php
@@ -10,7 +10,7 @@ final class PhabricatorEditorSetting
   }
 
   public function getSettingPanelKey() {
-    return PhabricatorDisplayPreferencesSettingsPanel::PANELKEY;
+    return PhabricatorExternalEditorSettingsPanel::PANELKEY;
   }
 
   protected function getSettingOrder() {
diff --git a/src/docs/user/userguide/external_editor.diviner b/src/docs/user/userguide/external_editor.diviner
index 16a34d90fb..c6f55183c8 100644
--- a/src/docs/user/userguide/external_editor.diviner
+++ b/src/docs/user/userguide/external_editor.diviner
@@ -11,7 +11,7 @@ and Diffusion in your preferred text editor.
 = Configuring Editors =
 
 To configure an external editor, go to {nav Settings > Application Settings >
-Display Preferences} and set "Editor Link" to a URI pattern (see below). This
+External Editor} and set "Editor Link" to a URI pattern (see below). This
 will enable an "Open in Editor" link in Differential, and an "Edit" button in
 Diffusion.