diff --git a/src/answer.sh b/src/answer.sh
index 9d915c04..10707a35 100644
--- a/src/answer.sh
+++ b/src/answer.sh
@@ -2057,6 +2057,16 @@ updateSetupScript() {
 
   fi
 
+  if ! disabled "${SHORTCUT:-}" && ! disabled "${SAMBA:-}"; then
+    printf -v content '%s\n%s\n%s\n%s' \
+      'rem Add the shared folder to the desktop and map it to drive Z:.' \
+      'reg.exe add "HKLM\SYSTEM\CurrentControlSet\Control\NetworkProvider" /v "RestoreConnection" /t REG_DWORD /d 0 /f' \
+      'if not exist "%USERPROFILE%\Desktop\Shared" mklink /d "%USERPROFILE%\Desktop\Shared" \\host.lan\Data' \
+      'net.exe use Z: \\host.lan\Data /persistent:yes'
+
+    replaceSetupBlock "$script" "SHARED_FOLDER" "$content" || return 1
+  fi
+
   enableLog "$script" || return 1
   updateProductKey "$script" || return 1
   removeSharedFolder "$script" || return 1
diff --git a/src/sif.sh b/src/sif.sh
index 30246bc4..c34176c6 100644
--- a/src/sif.sh
+++ b/src/sif.sh
@@ -724,6 +724,9 @@ writeRegistry() {
       '[HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\wscsvc]' \
       '"Start"=dword:00000004' \
       '' \
+      '[HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\NetworkProvider]' \
+      '"RestoreConnection"=dword:00000000' \
+      '' \
       '[HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows\WindowsUpdate\AU]' \
       '"NoAutoUpdate"=dword:00000001' \
       '' \