diff --git a/appveyor.yml b/appveyor.yml
index 0b43c6da5c..29a18ef625 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -27,14 +27,13 @@ environment:
     VS: '9.0'
     BUILD: release
     ARCH: x86
-    wxUSE_STL: 0
   - TOOLSET: nmake
     VS: '14.0'
     BUILD: debug
     ARCH: amd64
     wxUSE_STL: 1
+    wxUSE_WEBVIEW_EDGE: 1
   - TOOLSET: mingw
-    wxUSE_STL: 0
   - TOOLSET: msys2
     MSYSTEM: MINGW32
   - TOOLSET: cygwin
@@ -61,9 +60,12 @@ init:
 before_build:
 - ps: |
     $env:PATH = $env:PATH -replace "C:\\Program Files\\Git\\usr\\bin",""
+    if (-not (Test-Path env:wxUSE_STL)) { $env:wxUSE_STL = '0' }
+    if (-not (Test-Path env:wxUSE_WEBVIEW_EDGE)) { $env:wxUSE_WEBVIEW_EDGE = '0' }
     if (($env:compiler -ne "msys2") -and ($env:compiler -ne "cygwin")) {
       gc include\wx\msw\setup0.h |
       %{$_ -replace "define wxUSE_STL 0", "define wxUSE_STL $env:wxUSE_STL"} |
+      %{$_ -replace "define wxUSE_WEBVIEW_EDGE 0", "define wxUSE_WEBVIEW_EDGE $env:wxUSE_WEBVIEW_EDGE"} |
       sc include\wx\msw\setup.h
     }
 
diff --git a/build/tools/appveyor.bat b/build/tools/appveyor.bat
index 8ad6a2c021..bddcd5d9c7 100644
--- a/build/tools/appveyor.bat
+++ b/build/tools/appveyor.bat
@@ -1,4 +1,10 @@
 set MSBUILD_LOGGER=/logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll"
+
+if "%wxUSE_WEBVIEW_EDGE%"=="1" (
+    curl -L -o 3rdparty/webview2.zip https://www.nuget.org/api/v2/package/Microsoft.Web.WebView2
+    7z x 3rdparty/webview2.zip -o3rdparty/webview2 -aoa
+)
+
 goto %TOOLSET%
 
 :msbuild