diff --git a/build/cmake/lib/webview_chromium/CMakeLists.txt b/build/cmake/lib/webview_chromium/CMakeLists.txt
index b5a4a76eb8..ce1e630df1 100644
--- a/build/cmake/lib/webview_chromium/CMakeLists.txt
+++ b/build/cmake/lib/webview_chromium/CMakeLists.txt
@@ -56,10 +56,17 @@ endif()
 set(USE_ATL OFF)        # Disable usage of ATL in CEF
 set(USE_SANDBOX OFF)    # Disable usage of sandbox on windows
 
+set(lib_rls)
+set(lib_dbg)
+if(WIN32_MSVC_NAMING)
+    set(lib_dbg "d")
+endif()
+
 add_subdirectory(${CEF_ROOT} ${CEF_BUILD_DIR} EXCLUDE_FROM_ALL)
 set_target_properties(libcef_dll_wrapper PROPERTIES
     FOLDER "Third Party Libraries"
-    OUTPUT_NAME "libcef_dll_wrapper"
+    OUTPUT_NAME       "libcef_dll_wrapper${lib_rls}"
+    OUTPUT_NAME_DEBUG "libcef_dll_wrapper${lib_dbg}"
 )
 
 if(MSVC)
diff --git a/samples/webview/webview.cpp b/samples/webview/webview.cpp
index e0d08c3c17..324e040e54 100644
--- a/samples/webview/webview.cpp
+++ b/samples/webview/webview.cpp
@@ -65,10 +65,14 @@
 // This sample can be built with and without wxUSE_WEBVIEW_CHROMIUM, so we
 // can't put the libraries in the project linker options and have to link them
 // from here.
-#if defined(_MSC_VER) && wxUSE_WEBVIEW_CHROMIUM
+#if defined(_MSC_VER) && wxUSE_WEBVIEW_CHROMIUM && !WXUSINGDLL
     #pragma comment(lib, "libcef")
+#ifndef NDEBUG
+    #pragma comment(lib, "libcef_dll_wrapperd")
+#else
     #pragma comment(lib, "libcef_dll_wrapper")
 #endif
+#endif
 
 //We map menu items to their history items
 using wxMenuHistoryMap = std::map<int, wxSharedPtr<wxWebViewHistoryItem>>;