diff --git a/data/00_mobi.phosh.Phrog.gschema.override b/data/00_mobi.phosh.Phrog.gschema.override
new file mode 100644
index 00000000..52fb10be
--- /dev/null
+++ b/data/00_mobi.phosh.Phrog.gschema.override
@@ -0,0 +1,3 @@
+[org.gnome.desktop.media-handling:Phrog]
+automount=false
+
diff --git a/data/phrog-greetd-session b/data/phrog-greetd-session
index 5fb9a05d..0349276e 100644
--- a/data/phrog-greetd-session
+++ b/data/phrog-greetd-session
@@ -17,7 +17,7 @@ PHOC_INI=/etc/phrog/phoc.ini
 # Need to set XDG_CURRENT_DESKTOP now, otherwise gnome-session defaults it to
 # "GNOME", which is a problem because default desktop files for Squeekboard and
 # phosh-osk-stub specify "OnlyShowIn=Phosh;"
-export XDG_CURRENT_DESKTOP=Phosh:GNOME
+export XDG_CURRENT_DESKTOP=Phrog:Phosh:GNOME
 
 export GNOME_SESSION_AUTOSTART_DIR=/usr/share/phrog/autostart:/etc/phrog/autostart