diff --git a/appvm/qubes_core_appvm b/appvm/qubes_core_appvm
index 97229a5..32c0833 100755
--- a/appvm/qubes_core_appvm
+++ b/appvm/qubes_core_appvm
@@ -56,13 +56,6 @@ start()
 	MEMINFO_DELAY_USEC=100000
 	/usr/lib/qubes/meminfo-writer $MEM_CHANGE_THRESHOLD_KB $MEMINFO_DELAY_USEC &
 
-	if ! [ -f /home/user/.gnome2/nautilus-scripts/qvm-* ] ; then
-		echo "Creating symlinks for nautilus actions..."
-		su user -c 'mkdir -p /home/user/.gnome2/nautilus-scripts'
-		su user -c 'ln -s /usr/lib/qubes/qvm-copy-to-vm2.gnome /home/user/.gnome2/nautilus-scripts/"Copy to other AppVM"'
-		su user -c 'ln -s /usr/bin/qvm-open-in-dvm2 /home/user/.gnome2/nautilus-scripts/"Open in DisposableVM"'
-	fi
-
 	success
 	echo ""
 	return 0
diff --git a/common/qubes_core b/common/qubes_core
index c20f7d7..8fe0b2e 100755
--- a/common/qubes_core
+++ b/common/qubes_core
@@ -57,6 +57,15 @@ start()
 	/usr/lib/qubes/qrexec_agent 2>/var/log/qubes/qrexec_agent.log &
 
 	[ -x /rw/config/rc.local ] && /rw/config/rc.local
+
+	if ! [ -f /home/user/.gnome2/nautilus-scripts/.scripts_created ] ; then
+		echo "Creating symlinks for nautilus actions..."
+		su user -c 'mkdir -p /home/user/.gnome2/nautilus-scripts'
+		su user -c 'ln -s /usr/lib/qubes/qvm-copy-to-vm2.gnome /home/user/.gnome2/nautilus-scripts/"Copy to other AppVM"'
+		su user -c 'ln -s /usr/bin/qvm-open-in-dvm2 /home/user/.gnome2/nautilus-scripts/"Open in DisposableVM"'
+		su user -c 'touch /home/user/.gnome2/nautilus-scripts/.scripts_created'
+	fi
+
 	success
 	echo ""
 	return 0