diff --git a/CHANGELOG.md b/CHANGELOG.md
index 27c44f37..23f74b04 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -17,6 +17,11 @@ Changelog structure reference:
 
 ## [Unreleased]
 
+### Fixed
+
+- Project
+  - Zig Build tool window crashes when opening remote projects
+
 ## [20.1.2]
 
 ### Fixed
diff --git a/core/src/main/kotlin/com/falsepattern/zigbrains/project/steps/ui/BuildToolWindowFactory.kt b/core/src/main/kotlin/com/falsepattern/zigbrains/project/steps/ui/BuildToolWindowFactory.kt
index 657f90a9..15457cb8 100644
--- a/core/src/main/kotlin/com/falsepattern/zigbrains/project/steps/ui/BuildToolWindowFactory.kt
+++ b/core/src/main/kotlin/com/falsepattern/zigbrains/project/steps/ui/BuildToolWindowFactory.kt
@@ -22,15 +22,15 @@
 
 package com.falsepattern.zigbrains.project.steps.ui
 
-import com.falsepattern.zigbrains.shared.coroutine.runModalOrBlocking
+import com.falsepattern.zigbrains.shared.zigCoroutineScope
 import com.intellij.openapi.project.Project
 import com.intellij.openapi.wm.ToolWindow
 import com.intellij.openapi.wm.ToolWindowFactory
-import com.intellij.platform.ide.progress.ModalTaskOwner
+import kotlinx.coroutines.launch
 
 class BuildToolWindowFactory: ToolWindowFactory {
     override fun createToolWindowContent(project: Project, toolWindow: ToolWindow) {
-        runModalOrBlocking({ModalTaskOwner.project(project)}, {"BuildToolWindowFactory.createToolWindowContent"}) {
+        project.zigCoroutineScope.launch {
             BuildToolWindowContext.create(project, toolWindow)
         }
     }