diff --git a/code/CMakeModules/FindWindowsSDK.cmake b/code/CMakeModules/FindWindowsSDK.cmake
index 8f6ed5772..1b2affb99 100644
--- a/code/CMakeModules/FindWindowsSDK.cmake
+++ b/code/CMakeModules/FindWindowsSDK.cmake
@@ -43,10 +43,13 @@ FOREACH(_VERSION ${WINSDK_VERSIONS})
   DETECT_WINSDK_VERSION(${_VERSION})
 ENDFOREACH(_VERSION)
 
+SET(WINSDK_SUFFIX)
+
 IF(TARGET_ARM)
   SET(WINSDK8_SUFFIX "arm")
 ELSEIF(TARGET_X64)
   SET(WINSDK8_SUFFIX "x64")
+  SET(WINSDK_SUFFIX "x64")
 ELSEIF(TARGET_X86)
   SET(WINSDK8_SUFFIX "x86")
 ENDIF(TARGET_ARM)
@@ -133,7 +136,7 @@ FIND_PATH(WINSDK_SHARED_INCLUDE_DIR d3d9.h
 FIND_PATH(WINSDK_LIBRARY_DIR ComCtl32.lib
   HINTS
   ${WINSDK_DIR}/Lib/win8/um/${WINSDK8_SUFFIX}
-  ${WINSDK_DIR}/Lib
+  ${WINSDK_DIR}/Lib/${WINSDK_SUFFIX}
 )
 
 # signtool is used to sign executables