diff --git a/manjaro/gnome/desktop-overlay/etc/environment b/manjaro/gnome/desktop-overlay/etc/environment
index 3cf88147..50bd64ae 100644
--- a/manjaro/gnome/desktop-overlay/etc/environment
+++ b/manjaro/gnome/desktop-overlay/etc/environment
@@ -6,15 +6,11 @@
 
 QT_AUTO_SCREEN_SCALE_FACTOR=1
 
-#QT_QPA_PLATFORMTHEME="gnome"
-QT_QPA_PLATFORMTHEME=qt5ct
-#QT_STYLE_OVERRIDE="kvantum"
-
-# Force to use Xwayland backend
-# QT_QPA_PLATFORM=xcb
-
-#Not tested: this should disable window decorations
-# QT_WAYLAND_DISABLE_WINDOWDECORATION=1
+#QT_QPA_PLATFORMTHEME=qt5ct
+#QT_STYLE_OVERRIDE=kvantum
 
 EDITOR=/usr/bin/nano
-MOZ_ENABLE_WAYLAND=1
+
+if [[ "$XDG_SESSION_TYPE" == "wayland" ]]; then
+  export MOZ_ENABLE_WAYLAND=1
+fi