diff --git a/CMakeLists.txt b/CMakeLists.txt
index c563a6cda..9f1c4c4b2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -622,15 +622,13 @@ src/gui/volMeter.cpp
 src/gui/gui.cpp
 )
 
-if (WIN32 OR APPLE)
+if (WIN32 AND CMAKE_SIZEOF_VOID_P EQUAL 8)
   list(APPEND GUI_SOURCES extern/nfd-modified/src/nfd_common.cpp)
-endif()
-
-if (WIN32)
   list(APPEND GUI_SOURCES extern/nfd-modified/src/nfd_win.cpp)
 endif()
 
 if (APPLE)
+  list(APPEND GUI_SOURCES extern/nfd-modified/src/nfd_common.cpp)
   list(APPEND GUI_SOURCES src/gui/macstuff.m)
   list(APPEND GUI_SOURCES extern/nfd-modified/src/nfd_cocoa.mm)
 endif()
diff --git a/extern/nfd-modified/src/nfd_win.cpp b/extern/nfd-modified/src/nfd_win.cpp
index 0541cca83..b4fa5a5fa 100644
--- a/extern/nfd-modified/src/nfd_win.cpp
+++ b/extern/nfd-modified/src/nfd_win.cpp
@@ -5,11 +5,11 @@
  */
 
 
-//#ifdef __MINGW32__
+#ifdef __MINGW32__
 // Explicitly setting NTDDI version, this is necessary for the MinGW compiler
-//#define NTDDI_VERSION NTDDI_VISTA
-//#define _WIN32_WINNT _WIN32_WINNT_VISTA
-//#endif
+#define NTDDI_VERSION NTDDI_VISTA
+#define _WIN32_WINNT _WIN32_WINNT_VISTA
+#endif
 
 #define _CRTDBG_MAP_ALLOC
 #include <stdlib.h>
diff --git a/src/gui/fileDialog.h b/src/gui/fileDialog.h
index 6e91eddf8..b4a6d46e6 100644
--- a/src/gui/fileDialog.h
+++ b/src/gui/fileDialog.h
@@ -3,7 +3,7 @@
 #include <functional>
 #include <vector>
 
-#if defined(_WIN32) || defined(__APPLE__)
+#if defined(_WIN64) || defined(__APPLE__)
 #define USE_NFD
 #endif