diff --git a/build.gradle.kts b/build.gradle.kts
index 174d09626..8d6a9ce25 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -2,10 +2,6 @@ plugins {
     id("checkstyle")
 }
 
-apply {
-    from("javafx.gradle.kts")
-}
-
 group = "org.jackhuang"
 version = "3.0"
 
@@ -95,4 +91,8 @@ tasks.create("checkTranslations") {
     }
 }
 
+apply {
+    from("javafx.gradle.kts")
+}
+
 defaultTasks("clean", "build")
diff --git a/javafx.gradle.kts b/javafx.gradle.kts
index 4afa9a294..7af6eaec3 100644
--- a/javafx.gradle.kts
+++ b/javafx.gradle.kts
@@ -52,7 +52,7 @@ val jfxInClasspath =
 if (!jfxInClasspath && JavaVersion.current() >= JavaVersion.VERSION_11) {
     val os = System.getProperty("os.name").toLowerCase().let { osName ->
         when {
-            osName.contains("win") -> "win"
+            osName.contains("win") -> "windows"
             osName.contains("mac") -> "osx"
             osName.contains("linux") || osName.contains("unix") -> "linux"
             else -> null
@@ -67,7 +67,7 @@ if (!jfxInClasspath && JavaVersion.current() >= JavaVersion.VERSION_11) {
     }
 
     if (os != null && arch != null) {
-        val platform = jfxPlatforms.find { it.name == "$os-arch" }
+        val platform = jfxPlatforms.find { it.name == "$os-$arch" }
         if (platform != null) {
             val groupId = platform.groupId
             val version = platform.version