diff --git a/src/main/java/net/servicestack/idea/AddPythonAction.java b/src/main/java/net/servicestack/idea/AddPythonAction.java
index face60d..a9f4f41 100644
--- a/src/main/java/net/servicestack/idea/AddPythonAction.java
+++ b/src/main/java/net/servicestack/idea/AddPythonAction.java
@@ -36,7 +36,9 @@ public void actionPerformed(@NotNull AnActionEvent anActionEvent) {
     }
 
     private void showDialog(AddPythonRef dialog) {
-        dialog.setVisible(true);
+        try (var token = com.intellij.concurrency.ThreadContext.resetThreadContext()) {
+            dialog.setVisible(true);
+        }
     }
 
     @Override
diff --git a/src/main/java/net/servicestack/idea/AddServiceStackAction.java b/src/main/java/net/servicestack/idea/AddServiceStackAction.java
index b77fc68..7773932 100644
--- a/src/main/java/net/servicestack/idea/AddServiceStackAction.java
+++ b/src/main/java/net/servicestack/idea/AddServiceStackAction.java
@@ -128,8 +128,9 @@ else if (IDEAPomFileHelper.isMavenProjectWithKotlin(module)) {
         else if (GradleBuildFileHelper.isDartProject(module)) {
             dialog.setFileName("dtos.dart");
         }
-
-        dialog.setVisible(true);
+        try (var token = com.intellij.concurrency.ThreadContext.resetThreadContext()) {
+            dialog.setVisible(true);
+        }
     }
 
     private PsiPackage testPackage(Module module, String packageName, List<String> packageArray) {
diff --git a/src/main/java/net/servicestack/idea/common/AddTypeScriptAction.java b/src/main/java/net/servicestack/idea/common/AddTypeScriptAction.java
index d7f1355..d8a5a35 100644
--- a/src/main/java/net/servicestack/idea/common/AddTypeScriptAction.java
+++ b/src/main/java/net/servicestack/idea/common/AddTypeScriptAction.java
@@ -35,7 +35,9 @@ public void actionPerformed(@NotNull AnActionEvent anActionEvent) {
     }
 
     private void showDialog(AddTypeScriptRef dialog) {
-        dialog.setVisible(true);
+        try (var token = com.intellij.concurrency.ThreadContext.resetThreadContext()) {
+            dialog.setVisible(true);
+        }
     }
 
     @Override
diff --git a/src/main/java/net/servicestack/idea/php/AddPhpAction.java b/src/main/java/net/servicestack/idea/php/AddPhpAction.java
index 79cad78..4e25b00 100644
--- a/src/main/java/net/servicestack/idea/php/AddPhpAction.java
+++ b/src/main/java/net/servicestack/idea/php/AddPhpAction.java
@@ -34,7 +34,9 @@ public void actionPerformed(@NotNull AnActionEvent anActionEvent) {
     }
 
     private void showDialog(AddPhpRef dialog) {
-        dialog.setVisible(true);
+        try (var token = com.intellij.concurrency.ThreadContext.resetThreadContext()) {
+            dialog.setVisible(true);
+        }
     }
 
     @Override