diff --git a/win32/installer/hexchat.iss.tt b/win32/installer/hexchat.iss.tt
index 9f55e8fd..6c71de12 100644
--- a/win32/installer/hexchat.iss.tt
+++ b/win32/installer/hexchat.iss.tt
@@ -230,8 +230,16 @@ end;
 
 /////////////////////////////////////////////////////////////////////
 function CheckSpellInstall(): Boolean;
+var
+	Version: TWindowsVersion;
 begin
-	Result := DirExists(ExpandConstant('{localappdata}') + '\enchant');;
+	GetWindowsVersionEx(Version);
+
+	// Windows 8 or greater has built in spell check.
+	if Version.NTPlatform and (Version.Major > 6) or ((Version.Major = 6) and (Version.Minor > 1)) then
+		Result := True
+	else
+		Result := DirExists(ExpandConstant('{localappdata}') + '\enchant\myspell');
 end;
 
 /////////////////////////////////////////////////////////////////////