diff --git a/bash/usr-local-bin/startsway b/bash/usr-local-bin/startsway
index 1ccac06..c335a46 100755
--- a/bash/usr-local-bin/startsway
+++ b/bash/usr-local-bin/startsway
@@ -5,6 +5,15 @@
 
 set -x
 
+# As this script is kind of login manager and upstream wants to externalize
+# the task of telling Sway is used to it,  https://github.com/swaywm/sway/pull/4876#issuecomment-570790128
+# This seems to be required by Firefox and many others.
+# Don't listen to Wayber claiming this should be "Unity"
+export XDG_CURRENT_DESKTOP=sway
+# https://github.com/flameshot-org/flameshot/blob/master/docs/Sway%20and%20wlroots%20support.md
+# mentions this
+export XDG_SESSION_DESKTOP=sway
+
 # Using fcitx
 export XMODIFIERS=@im=fcitx
 export GTK_IM_MODULE="fcitx"
@@ -21,8 +30,5 @@ export SDL_VIDEODRIVER=wayland
 # Mozilla Products
 export MOZ_ENABLE_WAYLAND=1
 
-# Waybar states: [warning] For a functional tray you must have libappindicator-* installed and export XDG_CURRENT_DESKTOP=Unity
-export XDG_CURRENT_DESKTOP=Unity
-
 dbus-launch --exit-with-session sway --unsupported-gpu $@
 set +x