diff --git a/package/Config.in b/package/Config.in
index 5101736f1..3f56d3688 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -87,10 +87,6 @@ if !BR2_PACKAGE_BUSYBOX_HIDE_OTHERS
 source "package/module-init-tools/Config.in"
 source "package/modutils/Config.in"
 endif
-if !BR2_PACKAGE_BUSYBOX_HIDE_OTHERS
-# busybox has an editor..
-source "package/nano/Config.in"
-endif
 source "package/portage/Config.in"
 if !BR2_PACKAGE_BUSYBOX_HIDE_OTHERS
 source "package/procps/Config.in"
@@ -110,16 +106,28 @@ if !BR2_PACKAGE_BUSYBOX_HIDE_OTHERS
 source "package/tinylogin/Config.in"
 endif
 if !BR2_PACKAGE_BUSYBOX_HIDE_OTHERS
-# busybox has an editor..
-source "package/uemacs/Config.in"
-endif
-if !BR2_PACKAGE_BUSYBOX_HIDE_OTHERS
 source "package/util-linux/Config.in"
 endif
 if !BR2_PACKAGE_BUSYBOX_HIDE_OTHERS
 source "package/which/Config.in"
 endif
 
+if !BR2_PACKAGE_BUSYBOX_HIDE_OTHERS
+# busybox has an editor
+
+menuconfig BR2_TEXTEDIT_SUPPORT
+	bool "Text editors"
+	default y
+	help
+	  Support for text editors
+
+if BR2_TEXTEDIT_SUPPORT
+source "package/nano/Config.in"
+source "package/uemacs/Config.in"
+endif
+
+endif
+
 menuconfig BR2_NETWORK_SUPPORT
 	bool "Networking"
 	default y