diff --git a/changes.txt b/changes.txt
index 370ce3e9..8805ab32 100644
--- a/changes.txt
+++ b/changes.txt
@@ -1,5 +1,7 @@
 Changes in 1.6
 
+ - Use setWindowTextA in Windows device for WIN64 platform, posted by veegun
+
  - ELL_ERROR log events are now created when shaders fail to compile or link, reported by Halan
 
  - irrList now uses irrAllocator, fixed by Nox
diff --git a/source/Irrlicht/CIrrDeviceWin32.cpp b/source/Irrlicht/CIrrDeviceWin32.cpp
index ed822b17..c5e72e00 100644
--- a/source/Irrlicht/CIrrDeviceWin32.cpp
+++ b/source/Irrlicht/CIrrDeviceWin32.cpp
@@ -571,14 +571,24 @@ void CIrrDeviceWin32::setWindowCaption(const wchar_t* text)
 	if (IsNonNTWindows)
 	{
 		const core::stringc s = text;
+#ifdef WIN64 
+		SetWindowTextA(HWnd, s.c_str()); 
+#else
 		SendMessageTimeout(HWnd, WM_SETTEXT, 0,
 				reinterpret_cast<LPARAM>(s.c_str()),
 				SMTO_ABORTIFHUNG, 2000, &dwResult);
+#endif
 	}
 	else
+	{
+#ifdef WIN64 
+		SetWindowTextW(HWnd, text); 
+#else 
 		SendMessageTimeoutW(HWnd, WM_SETTEXT, 0,
 				reinterpret_cast<LPARAM>(text),
 				SMTO_ABORTIFHUNG, 2000, &dwResult);
+#endif
+	}
 }