diff --git a/Makefile b/Makefile
index 582a14fd..df0e0015 100644
--- a/Makefile
+++ b/Makefile
@@ -221,6 +221,8 @@ endif
 		$(DESTDIR)/etc/xdg/autostart/qubes-keymap.desktop
 	install -m 0644 -D appvm-scripts/etc/xdgautostart/qubes-gtk4-workarounds.desktop \
 		$(DESTDIR)/etc/xdg/autostart/qubes-gtk4-workarounds.desktop
+	install -m 0644 -D appvm-scripts/etc/xdgautostart/qubes-set-xsettings-xfconf-query.desktop \
+		$(DESTDIR)/etc/xdg/autostart/qubes-set-xsettings-xfconf-query.desktop
 	install -D -m 0644 appvm-scripts/usr/lib/sysctl.d/30-qubes-gui-agent.conf \
 		$(DESTDIR)/usr/lib/sysctl.d/30-qubes-gui-agent.conf
 	install -D -m 0644 appvm-scripts/lib/udev/rules.d/70-master-of-seat.rules \
diff --git a/appvm-scripts/etc/xdgautostart/qubes-set-xsettings-xfconf-query.desktop b/appvm-scripts/etc/xdgautostart/qubes-set-xsettings-xfconf-query.desktop
new file mode 100644
index 00000000..d126aa12
--- /dev/null
+++ b/appvm-scripts/etc/xdgautostart/qubes-set-xsettings-xfconf-query.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Version=1.0
+Encoding=UTF-8
+Name=xfconf-query for Xfce-based QubesVM
+Exec=/usr/bin/xfconf-query --channel xsettings --property /Gtk/DecorationLayout --set ""
+Terminal=false
+Type=Application
+OnlyShowIn=X-QUBES;
diff --git a/debian/qubes-gui-agent-xfce.install b/debian/qubes-gui-agent-xfce.install
index b701d8c7..089bdd60 100644
--- a/debian/qubes-gui-agent-xfce.install
+++ b/debian/qubes-gui-agent-xfce.install
@@ -1 +1,2 @@
-etc/X11/Xsession.d/60xfce-desktop
\ No newline at end of file
+etc/X11/Xsession.d/60xfce-desktop
+etc/xdg/autostart/qubes-set-xsettings-xfconf-query.desktop
diff --git a/rpm_spec/gui-agent.spec.in b/rpm_spec/gui-agent.spec.in
index ac95d997..d158791a 100644
--- a/rpm_spec/gui-agent.spec.in
+++ b/rpm_spec/gui-agent.spec.in
@@ -364,6 +364,7 @@ rm -f %{name}-%{version}
 
 %files xfce
 %{xinitrc_dir}/60xfce-desktop.sh
+/etc/xdg/autostart/qubes-set-xsettings-xfconf-query.desktop
 
 %files -n qubes-gui-vnc
 #/lib/systemd/system/qubes-gui-vncserver.service