diff --git a/src/main/java/com/checkmarx/intellij/tool/window/actions/CancelScanAction.java b/src/main/java/com/checkmarx/intellij/tool/window/actions/CancelScanAction.java
index d9ce0dcc..0688f1b4 100644
--- a/src/main/java/com/checkmarx/intellij/tool/window/actions/CancelScanAction.java
+++ b/src/main/java/com/checkmarx/intellij/tool/window/actions/CancelScanAction.java
@@ -8,6 +8,7 @@
 import com.intellij.ide.ActivityTracker;
 import com.intellij.ide.util.PropertiesComponent;
 import com.intellij.notification.NotificationType;
+import com.intellij.openapi.actionSystem.ActionUpdateThread;
 import com.intellij.openapi.actionSystem.AnAction;
 import com.intellij.openapi.actionSystem.AnActionEvent;
 import com.intellij.openapi.diagnostic.Logger;
@@ -62,8 +63,12 @@ public void update(@NotNull AnActionEvent e) {
             e.getPresentation().setEnabled(isScanRunning);
         }
         catch (Exception ex) {
-            ex.printStackTrace();
             e.getPresentation().setEnabled(false);
         }
     }
+    @Override
+    public @NotNull ActionUpdateThread getActionUpdateThread() {
+        return ActionUpdateThread.BGT;
+    }
+
 }
diff --git a/src/main/java/com/checkmarx/intellij/tool/window/actions/CollapseAllAction.java b/src/main/java/com/checkmarx/intellij/tool/window/actions/CollapseAllAction.java
index ab0dc5f6..2687af7d 100644
--- a/src/main/java/com/checkmarx/intellij/tool/window/actions/CollapseAllAction.java
+++ b/src/main/java/com/checkmarx/intellij/tool/window/actions/CollapseAllAction.java
@@ -3,6 +3,7 @@
 import com.checkmarx.intellij.Bundle;
 import com.checkmarx.intellij.Resource;
 import com.checkmarx.intellij.tool.window.CxToolWindowPanel;
+import com.intellij.openapi.actionSystem.ActionUpdateThread;
 import com.intellij.openapi.actionSystem.AnAction;
 import com.intellij.openapi.actionSystem.AnActionEvent;
 import org.jetbrains.annotations.NotNull;
@@ -28,4 +29,10 @@ public CollapseAllAction() {
     public void actionPerformed(@NotNull AnActionEvent e) {
         Optional.ofNullable(getCxToolWindowPanel(e)).ifPresent(CxToolWindowPanel::collapseAll);
     }
+
+    @Override
+    public @NotNull ActionUpdateThread getActionUpdateThread() {
+        return ActionUpdateThread.EDT;
+    }
+
 }
diff --git a/src/main/java/com/checkmarx/intellij/tool/window/actions/OpenSettingsAction.java b/src/main/java/com/checkmarx/intellij/tool/window/actions/OpenSettingsAction.java
index ebf8e342..61b85dde 100644
--- a/src/main/java/com/checkmarx/intellij/tool/window/actions/OpenSettingsAction.java
+++ b/src/main/java/com/checkmarx/intellij/tool/window/actions/OpenSettingsAction.java
@@ -3,6 +3,7 @@
 import com.checkmarx.intellij.Bundle;
 import com.checkmarx.intellij.Resource;
 import com.checkmarx.intellij.settings.global.GlobalSettingsConfigurable;
+import com.intellij.openapi.actionSystem.ActionUpdateThread;
 import com.intellij.openapi.actionSystem.AnAction;
 import com.intellij.openapi.actionSystem.AnActionEvent;
 import com.intellij.openapi.options.ShowSettingsUtil;
@@ -27,4 +28,10 @@ public void actionPerformed(@NotNull AnActionEvent e) {
         ShowSettingsUtil.getInstance()
                         .showSettingsDialog(e.getProject(), GlobalSettingsConfigurable.class);
     }
+
+    @Override
+    public @NotNull ActionUpdateThread getActionUpdateThread() {
+        return ActionUpdateThread.EDT;
+    }
+
 }
diff --git a/src/main/java/com/checkmarx/intellij/tool/window/actions/StartScanAction.java b/src/main/java/com/checkmarx/intellij/tool/window/actions/StartScanAction.java
index 4e5296b5..14374e79 100644
--- a/src/main/java/com/checkmarx/intellij/tool/window/actions/StartScanAction.java
+++ b/src/main/java/com/checkmarx/intellij/tool/window/actions/StartScanAction.java
@@ -15,6 +15,7 @@
 import com.intellij.ide.ActivityTracker;
 import com.intellij.ide.util.PropertiesComponent;
 import com.intellij.notification.*;
+import com.intellij.openapi.actionSystem.ActionUpdateThread;
 import com.intellij.openapi.actionSystem.AnAction;
 import com.intellij.openapi.actionSystem.AnActionEvent;
 import com.intellij.openapi.diagnostic.Logger;
@@ -289,7 +290,6 @@ public void update(@NotNull AnActionEvent e) {
             e.getPresentation().setEnabled(!isScanRunning && !isPollingScan && !scanTriggered && projectAndBranchSelected);
         }
         catch (Exception ex) {
-            LOGGER.error(ex);
             e.getPresentation().setEnabled(false);
         }
     }
@@ -311,4 +311,10 @@ public static void cancelRunningScan() {
     private static String msg(Resource resource, Object... params) {
         return Bundle.message(resource, params);
     }
+
+    @Override
+    public @NotNull ActionUpdateThread getActionUpdateThread() {
+        return ActionUpdateThread.BGT;
+    }
+
 }
diff --git a/src/main/java/com/checkmarx/intellij/tool/window/actions/selection/ResetSelectionAction.java b/src/main/java/com/checkmarx/intellij/tool/window/actions/selection/ResetSelectionAction.java
index 228f948d..543f5205 100644
--- a/src/main/java/com/checkmarx/intellij/tool/window/actions/selection/ResetSelectionAction.java
+++ b/src/main/java/com/checkmarx/intellij/tool/window/actions/selection/ResetSelectionAction.java
@@ -4,6 +4,7 @@
 import com.checkmarx.intellij.Resource;
 import com.checkmarx.intellij.tool.window.actions.CxToolWindowAction;
 import com.intellij.icons.AllIcons;
+import com.intellij.openapi.actionSystem.ActionUpdateThread;
 import com.intellij.openapi.actionSystem.AnAction;
 import com.intellij.openapi.actionSystem.AnActionEvent;
 import lombok.Getter;
@@ -45,4 +46,9 @@ public void actionPerformed(@NotNull AnActionEvent e) {
             cxToolWindowPanel.resetPanel();
         });
     }
+    @Override
+    public @NotNull ActionUpdateThread getActionUpdateThread() {
+        return ActionUpdateThread.EDT;
+    }
+
 }