diff --git a/recipes-kde/packagegroups/kde-world.bb b/recipes-kde/packagegroups/kde-world.bb
index 043133fb..06a146bc 100644
--- a/recipes-kde/packagegroups/kde-world.bb
+++ b/recipes-kde/packagegroups/kde-world.bb
@@ -77,7 +77,6 @@ RDEPENDS_${PN} = "         \
     kdeplasma-addons \
     khtml \
     khelpcenter \
-    khotkeys \
     kinfocenter \
     kio-extras \
     kmenuedit \
@@ -90,7 +89,7 @@ RDEPENDS_${PN} = "         \
     muon \
     \
     kwayland \
-    ${@bb.utils.contains("DISTRO_FEATURES", "x11", "kwin", "",d)} \
+    ${@bb.utils.contains("DISTRO_FEATURES", "x11", "kwin khotkeys", "",d)} \
 "
 
 
diff --git a/recipes-kde/plasma/untier/khotkeys/khotkeys.bb b/recipes-kde/plasma/untier/khotkeys/khotkeys.bb
index 8e5d0484..fe0fe128 100644
--- a/recipes-kde/plasma/untier/khotkeys/khotkeys.bb
+++ b/recipes-kde/plasma/untier/khotkeys/khotkeys.bb
@@ -5,6 +5,8 @@ LIC_FILES_CHKSUM = " \
     file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c \
 "
 
+REQUIRED_DISTRO_FEATURES = "x11"
+
 inherit kde-plasma
 
 DEPENDS += " \
diff --git a/recipes-kde/plasma/untier/kmenuedit/kmenuedit.bb b/recipes-kde/plasma/untier/kmenuedit/kmenuedit.bb
index 29c1ad3e..c5ac4da4 100644
--- a/recipes-kde/plasma/untier/kmenuedit/kmenuedit.bb
+++ b/recipes-kde/plasma/untier/kmenuedit/kmenuedit.bb
@@ -15,7 +15,11 @@ DEPENDS += " \
     kio \
     sonnet \
     kdelibs4support \
-    khotkeys \
+"
+
+# REVISIT optionals
+DEPENDS += " \
+    ${@bb.utils.contains("DISTRO_FEATURES", "x11", "khotkeys", "",d)} \
 "
 
 PV = "${PLASMA_VERSION}"