diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
index f93b5ac9..d213baa3 100644
--- a/.github/workflows/windows.yml
+++ b/.github/workflows/windows.yml
@@ -40,6 +40,7 @@ jobs:
         run: |
           mkdir packaged
           cp -r build/* packaged/
+          cp C:/Windows/System32/msvcp140.dll packaged/Release/msvcp140.dll
         working-directory: ${{ github.workspace }}
       - name: Run tests
         run: ctest --output-on-failure --test-dir build
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2ec82dca..5a5e839c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -29,7 +29,7 @@ if(MSVC)
     else()
       target_compile_options(${PROJECT_NAME} PRIVATE /W4)
     endif()
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /source-charset:UTF-8")
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /source-charset:UTF-8 /D_DISABLE_CONSTEXPR_MUTEX_CONSTRUCTOR")
 else()
   target_compile_options(${PROJECT_NAME} PRIVATE -Wall -Wextra
     # additional warnings
diff --git a/src/window/input.cpp b/src/window/input.cpp
index 9e13dcd6..a4b4a913 100644
--- a/src/window/input.cpp
+++ b/src/window/input.cpp
@@ -111,13 +111,6 @@ mousecode input_util::mousecode_from(const std::string& name) {
 
 std::string input_util::to_string(keycode code) {
     int icode_repr = static_cast<int>(code);
-#ifdef _WIN32
-    char name[64];
-    int result =
-        GetKeyNameTextA(glfwGetKeyScancode(icode_repr) << 16, name, 64);
-    if (result == 0) return "Unknown";
-    return name;
-#else
     const char* name =
         glfwGetKeyName(icode_repr, glfwGetKeyScancode(icode_repr));
     if (name == nullptr) {
@@ -207,7 +200,6 @@ std::string input_util::to_string(keycode code) {
         }
     }
     return std::string(name);
-#endif  // _WIN32
 }
 
 std::string input_util::to_string(mousecode code) {