diff --git a/dist/win/build.bat b/dist/win/build.bat
index ebfe2aa0b..8ca9183b4 100644
--- a/dist/win/build.bat
+++ b/dist/win/build.bat
@@ -1,2 +1,2 @@
 @echo off
-powershell -NoExit -ExecutionPolicy Unrestricted -Command .\build.ps1
\ No newline at end of file
+powershell -NoLogo -NoExit -ExecutionPolicy Unrestricted -Command .\build.ps1
\ No newline at end of file
diff --git a/dist/win/build.ps1 b/dist/win/build.ps1
index e4024d46d..8ed5d9193 100644
--- a/dist/win/build.ps1
+++ b/dist/win/build.ps1
@@ -68,7 +68,6 @@ Copy-Item "$buildDir\..\..\target\cryptomator-*.jar" -Destination "$buildDir\..\
 Copy-Item "contrib\*" -Destination "Cryptomator"
 attrib -r "Cryptomator\Cryptomator.exe"
 
-
 # create .msi bundle
 $Env:JP_WIXWIZARD_RESOURCES = "$buildDir\resources"
 & "$Env:JAVA_HOME\bin\jpackage" `
diff --git a/dist/win/contrib/patchHosts.bat b/dist/win/contrib/patchHosts.bat
new file mode 100644
index 000000000..6363b3e33
--- /dev/null
+++ b/dist/win/contrib/patchHosts.bat
@@ -0,0 +1,3 @@
+@echo off
+cd %~dp0
+powershell -NoLogo -NonInteractive -ExecutionPolicy Unrestricted -Command .\patchHosts.ps1
\ No newline at end of file
diff --git a/dist/win/contrib/patchHosts.ps1 b/dist/win/contrib/patchHosts.ps1
new file mode 100644
index 000000000..bab50cc63
--- /dev/null
+++ b/dist/win/contrib/patchHosts.ps1
@@ -0,0 +1,16 @@
+#Requires -RunAsAdministrator
+
+$sysdir = [Environment]::SystemDirectory
+$hostsFile = "$sysdir\drivers\etc\hosts"
+$aliasLine = '127.0.0.1 cryptomator-vault'
+
+foreach ($line in Get-Content $hostsFile) {
+	if ($line -eq $aliasLine){
+		Write-Output 'No changes necessary'
+        exit 0
+    }
+}
+
+Add-Content -Path $hostsFile -Encoding ascii -Value "`r`n$aliasLine"
+Write-Output 'Added alias to hosts file'
+exit 0
diff --git a/dist/win/resources/main.wxs b/dist/win/resources/main.wxs
index cd9677a1c..8a0123a57 100644
--- a/dist/win/resources/main.wxs
+++ b/dist/win/resources/main.wxs
@@ -124,6 +124,8 @@
       <CustomAction Id="JpSetARPURLUPDATEINFO" Property="ARPURLUPDATEINFO" Value="$(var.JpUpdateURL)" />
     <?endif?>
 
+    <CustomAction Id="PatchHostsFile" Impersonate="no" ExeCommand="[INSTALLDIR]patchHosts.bat" Directory="INSTALLDIR" Execute="deferred" Return="asyncWait" />
+
     <?ifdef JpIcon ?>
     <Property Id="ARPPRODUCTICON" Value="JpARPPRODUCTICON"/>
     <Icon Id="JpARPPRODUCTICON" SourceFile="$(var.JpIcon)"/>
@@ -153,6 +155,8 @@
       <Custom Action="JpDisallowDowngrade" After="FindRelatedProducts">JP_DOWNGRADABLE_FOUND</Custom>
       <?endif?>
       <RemoveExistingProducts Before="CostInitialize"/>
+
+      <Custom Action="PatchHostsFile" After="InstallFiles">NOT Installed OR REINSTALL</Custom>
     </InstallExecuteSequence>
 
     <WixVariable Id="WixUIBannerBmp" Value="$(env.JP_WIXWIZARD_RESOURCES)\banner.bmp" />