diff --git a/distributions/LibreELEC/options b/distributions/LibreELEC/options
index 9760c6d602..e0939356c4 100644
--- a/distributions/LibreELEC/options
+++ b/distributions/LibreELEC/options
@@ -208,9 +208,6 @@
 # build with installer (yes / no)
   INSTALLER_SUPPORT="yes"
 
-# Windowmanager to use (fluxbox / none)
-  WINDOWMANAGER="fluxbox"
-
 # build and install remote support (yes / no)
   REMOTE_SUPPORT="yes"
 
diff --git a/projects/Generic/devices/Generic/options b/projects/Generic/devices/Generic/options
index e8c1830201..ad64946caa 100644
--- a/projects/Generic/devices/Generic/options
+++ b/projects/Generic/devices/Generic/options
@@ -7,6 +7,9 @@
 # Displayserver to use (weston / x11 / no)
   DISPLAYSERVER="no"
 
+# Windowmanager to use (fluxbox / none)
+  WINDOWMANAGER="none"
+
 # KODI Player implementation to use (mesa / default)
   KODIPLAYER_DRIVER="mesa"
 
diff --git a/projects/Generic/devices/wayland/options b/projects/Generic/devices/wayland/options
index 5c937c0006..c9c0f1f332 100644
--- a/projects/Generic/devices/wayland/options
+++ b/projects/Generic/devices/wayland/options
@@ -7,6 +7,9 @@
 # Displayserver to use (weston / x11 / no)
   DISPLAYSERVER="weston"
 
+# Windowmanager to use (fluxbox / none)
+  WINDOWMANAGER="none"
+
 # KODI Player implementation to use (mesa / default)
   KODIPLAYER_DRIVER="mesa"
 
diff --git a/projects/Generic/devices/x11/options b/projects/Generic/devices/x11/options
index faeb0f0d86..9f0a2e7f71 100644
--- a/projects/Generic/devices/x11/options
+++ b/projects/Generic/devices/x11/options
@@ -7,6 +7,9 @@
 # Displayserver to use (weston / x11 / no)
   DISPLAYSERVER="x11"
 
+# Windowmanager to use (fluxbox / none)
+  WINDOWMANAGER="fluxbox"
+
 # KODI Player implementation to use (mesa / default)
   KODIPLAYER_DRIVER="default"