diff --git a/CHANGELOG.md b/CHANGELOG.md
index 058774a..cf9fba4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,10 +4,16 @@
 
 ## Unreleased
 
+## 1.18.0 - 2024-05-21
+- Updated plugin compatibility for IntelliJ 2025.1
+
+## 1.17.0
+- Support for IntelliJ 2024.1
+
 ## 1.12.0 - 2023-06-16
-- Changelog update - `v1.11.0` by @github-actions in https://github.com/eirikb/AvaJavaScriptTestRunnerRunConfigurationGenerator/pull/107
-- 108 plugin doesnt properly support tests with trailing spaces by @eirikb in https://github.com/eirikb/AvaJavaScriptTestRunnerRunConfigurationGenerator/pull/109
-- Bump verifyIdeVersions and platformVersion by @eirikb in https://github.com/eirikb/AvaJavaScriptTestRunnerRunConfigurationGenerator/pull/110
+- Changelog update - `v1.11.0` by @github-actions in https://github.com/eirikb/AvaJavaScriptTestRunnerRunConfigurationGenerator/pull/107
+- 108 plugin doesnt properly support tests with trailing spaces by @eirikb in https://github.com/eirikb/AvaJavaScriptTestRunnerRunConfigurationGenerator/pull/109
+- Bump verifyIdeVersions and platformVersion by @eirikb in https://github.com/eirikb/AvaJavaScriptTestRunnerRunConfigurationGenerator/pull/110
 - Version bump by @eirikb in https://github.com/eirikb/AvaJavaScriptTestRunnerRunConfigurationGenerator/pull/111
 
 ## 1.11.0 - 2023-04-13
diff --git a/gradle.properties b/gradle.properties
index 75e2a7f..09e9b9a 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -2,9 +2,9 @@
 # -> https://plugins.jetbrains.com/docs/intellij/intellij-artifacts.html
 pluginGroup=no.eirikb.avatest
 pluginName=AvaJavaScriptTestRunnerRunConfigurationGenerator
-pluginVersion=1.17.0
+pluginVersion=1.18.0
 pluginSinceBuild=233
-pluginUntilBuild=243.*
+pluginUntilBuild=251.*
 # Plugin Verifier integration -> https://github.com/JetBrains/gradle-intellij-plugin#plugin-verifier-dsl
 # See https://jb.gg/intellij-platform-builds-list for available build versions
 pluginVerifierIdeVersions=2024.1
diff --git a/src/main/kotlin/no/eirikb/avatest/actions/AvaJavaScriptTestRunnerRunConfigurationGenerator.kt b/src/main/kotlin/no/eirikb/avatest/actions/AvaJavaScriptTestRunnerRunConfigurationGenerator.kt
index 3a9481b..fe2080f 100644
--- a/src/main/kotlin/no/eirikb/avatest/actions/AvaJavaScriptTestRunnerRunConfigurationGenerator.kt
+++ b/src/main/kotlin/no/eirikb/avatest/actions/AvaJavaScriptTestRunnerRunConfigurationGenerator.kt
@@ -16,6 +16,7 @@ import com.intellij.lang.javascript.psi.JSLiteralExpression
 import com.intellij.notification.Notification
 import com.intellij.notification.NotificationType
 import com.intellij.notification.Notifications
+import com.intellij.openapi.actionSystem.ActionUpdateThread
 import com.intellij.openapi.actionSystem.AnAction
 import com.intellij.openapi.actionSystem.AnActionEvent
 import com.intellij.openapi.actionSystem.CommonDataKeys
@@ -58,6 +59,9 @@ fun getRunArguments(relPath: String, testName: String?): String {
 }
 
 class AvaJavaScriptTestRunnerRunConfigurationGenerator : AnAction() {
+    override fun getActionUpdateThread(): ActionUpdateThread {
+        return ActionUpdateThread.BGT
+    }
     companion object {
         fun performAction(e: AnActionEvent, debug: Boolean = false, offset: Int? = null) {
             val project = e.project
diff --git a/src/main/kotlin/no/eirikb/avatest/markers/AvaRunContributor.kt b/src/main/kotlin/no/eirikb/avatest/markers/AvaRunContributor.kt
index 9c65857..9b52f89 100644
--- a/src/main/kotlin/no/eirikb/avatest/markers/AvaRunContributor.kt
+++ b/src/main/kotlin/no/eirikb/avatest/markers/AvaRunContributor.kt
@@ -6,6 +6,7 @@ import com.intellij.icons.AllIcons.RunConfigurations.TestState
 import com.intellij.lang.javascript.psi.JSCallExpression
 import com.intellij.lang.javascript.psi.JSExpression
 import com.intellij.lang.javascript.psi.JSLiteralExpression
+import com.intellij.openapi.actionSystem.ActionUpdateThread
 import com.intellij.openapi.actionSystem.AnAction
 import com.intellij.openapi.actionSystem.AnActionEvent
 import com.intellij.psi.PsiElement
@@ -56,4 +57,8 @@ class AvaRunContributor : RunLineMarkerContributor() {
 }
 
 abstract class RunAction(prefix: String, testName: String, icon: Icon) :
-    AnAction("$prefix '$testName'", "$prefix '$testName'", icon)
+    AnAction("$prefix '$testName'", "$prefix '$testName'", icon) {
+    override fun getActionUpdateThread(): ActionUpdateThread {
+        return ActionUpdateThread.BGT
+    }
+}