diff --git a/src/com/magento/idea/magento2plugin/actions/generation/dialog/NewGraphQlResolverDialog.java b/src/com/magento/idea/magento2plugin/actions/generation/dialog/NewGraphQlResolverDialog.java
index 5990542f3..83b6080cf 100644
--- a/src/com/magento/idea/magento2plugin/actions/generation/dialog/NewGraphQlResolverDialog.java
+++ b/src/com/magento/idea/magento2plugin/actions/generation/dialog/NewGraphQlResolverDialog.java
@@ -113,7 +113,12 @@ public static void open(final Project project, final PsiDirectory directory) {
         final NewGraphQlResolverDialog dialog = new NewGraphQlResolverDialog(project, directory);
         dialog.pack();
         dialog.centerDialog(dialog);
-        dialog.setVisible(true);
+
+        // TODO: It's a workaround. Proper fix should be done as:
+        // https://github.com/magento/magento2-phpstorm-plugin/issues/2080
+        try (var token = com.intellij.concurrency.ThreadContext.resetThreadContext()) {
+            dialog.setVisible(true);
+        }
     }
 
     protected void onOK() {