diff --git a/rpm_spec/core-vm.spec b/rpm_spec/core-vm.spec
index ecd5966..f02cdcc 100644
--- a/rpm_spec/core-vm.spec
+++ b/rpm_spec/core-vm.spec
@@ -488,6 +488,7 @@ The Qubes core startup configuration for SystemD init.
 /usr/lib/qubes/init/prepare-dvm.sh
 /usr/lib/qubes/init/network-proxy-setup.sh
 /usr/lib/qubes/init/misc-post.sh
+/usr/lib/qubes/init/misc-post-stop.sh
 /usr/lib/qubes/init/qubes-sysinit.sh
 /usr/lib/qubes/init/NetworkManager.service
 /usr/lib/qubes/init/cups.service
diff --git a/vm-init.d/qubes_core b/vm-init.d/qubes_core
index eb02e77..450e68b 100755
--- a/vm-init.d/qubes_core
+++ b/vm-init.d/qubes_core
@@ -96,6 +96,8 @@ start()
 
 stop()
 {
+	su -c 'mkdir -p /home_volatile/user/.local/share/applications' user
+	su -c 'cp -a /home/user/.local/share/applications/defaults.list /home_volatile/user/.local/share/applications/' user
 	return 0
 }
 
diff --git a/vm-systemd/qubes-misc-post.service b/vm-systemd/qubes-misc-post.service
index 2dc9051..8aec208 100644
--- a/vm-systemd/qubes-misc-post.service
+++ b/vm-systemd/qubes-misc-post.service
@@ -6,6 +6,7 @@ After=qubes-dvm.service
 Type=oneshot
 RemainAfterExit=yes
 ExecStart=/usr/lib/qubes/init/misc-post.sh
+ExecStop=/usr/lib/qubes/init/misc-post-stop.sh
 
 [Install]
 WantedBy=multi-user.target