diff --git a/Makefile b/Makefile
index 5aae196..2715bcc 100644
--- a/Makefile
+++ b/Makefile
@@ -198,6 +198,7 @@ install-common:
 		misc/20_org.gnome.settings-daemon.plugins.updates.qubes.gschema.override \
 		misc/20_org.gnome.nautilus.qubes.gschema.override \
 		misc/20_org.mate.NotificationDaemon.qubes.gschema.override \
+		misc/20_org.gnome.desktop.wm.preferences.qubes.gschema.override \
 		$(DESTDIR)/usr/share/glib-2.0/schemas/
 	install -g user -m 2775 -d $(DESTDIR)/var/lib/qubes/dom0-updates
 	install -D -m 0644 misc/qubes-master-key.asc $(DESTDIR)/usr/share/qubes/qubes-master-key.asc
diff --git a/misc/20_org.gnome.desktop.wm.preferences.qubes.gschema.override b/misc/20_org.gnome.desktop.wm.preferences.qubes.gschema.override
new file mode 100644
index 0000000..f28ee67
--- /dev/null
+++ b/misc/20_org.gnome.desktop.wm.preferences.qubes.gschema.override
@@ -0,0 +1,2 @@
+[org.gnome.desktop.wm.preferences]
+button-layout='appmenu:'
diff --git a/rpm_spec/core-vm.spec b/rpm_spec/core-vm.spec
index d395468..3456131 100644
--- a/rpm_spec/core-vm.spec
+++ b/rpm_spec/core-vm.spec
@@ -523,6 +523,7 @@ rm -f %{name}-%{version}
 /usr/share/glib-2.0/schemas/20_org.gnome.settings-daemon.plugins.updates.qubes.gschema.override
 /usr/share/glib-2.0/schemas/20_org.gnome.nautilus.qubes.gschema.override
 /usr/share/glib-2.0/schemas/20_org.mate.NotificationDaemon.qubes.gschema.override
+/usr/share/glib-2.0/schemas/20_org.gnome.desktop.wm.preferences.qubes.gschema.override
 /usr/share/nautilus-python/extensions/qvm_copy_nautilus.py*
 /usr/share/nautilus-python/extensions/qvm_move_nautilus.py*
 /usr/share/nautilus-python/extensions/qvm_dvm_nautilus.py*