diff --git a/flutter-idea/src/io/flutter/actions/DeviceSelectorAction.java b/flutter-idea/src/io/flutter/actions/DeviceSelectorAction.java
index 7ed1cb51ff..42fe55cd0e 100644
--- a/flutter-idea/src/io/flutter/actions/DeviceSelectorAction.java
+++ b/flutter-idea/src/io/flutter/actions/DeviceSelectorAction.java
@@ -234,5 +234,10 @@ public void actionPerformed(AnActionEvent e) {
         service.setSelectedDevice(device);
       }
     }
+
+    @Override
+    public @NotNull ActionUpdateThread getActionUpdateThread() {
+      return ActionUpdateThread.BGT;
+    }
   }
 }
diff --git a/flutter-idea/src/io/flutter/actions/OpenEmulatorAction.java b/flutter-idea/src/io/flutter/actions/OpenEmulatorAction.java
index 57a29c374e..10d29a6dc9 100644
--- a/flutter-idea/src/io/flutter/actions/OpenEmulatorAction.java
+++ b/flutter-idea/src/io/flutter/actions/OpenEmulatorAction.java
@@ -5,6 +5,7 @@
  */
 package io.flutter.actions;
 
+import com.intellij.openapi.actionSystem.ActionUpdateThread;
 import com.intellij.openapi.actionSystem.AnAction;
 import com.intellij.openapi.actionSystem.AnActionEvent;
 import com.intellij.openapi.project.Project;
@@ -47,4 +48,9 @@ public OpenEmulatorAction(AndroidEmulator emulator) {
   public void actionPerformed(@NotNull AnActionEvent event) {
     emulator.startEmulator();
   }
+
+  @Override
+  public @NotNull ActionUpdateThread getActionUpdateThread() {
+    return ActionUpdateThread.BGT;
+  }
 }
diff --git a/flutter-idea/src/io/flutter/actions/OpenSimulatorAction.java b/flutter-idea/src/io/flutter/actions/OpenSimulatorAction.java
index 7dc86b1309..e2fe39a3d8 100644
--- a/flutter-idea/src/io/flutter/actions/OpenSimulatorAction.java
+++ b/flutter-idea/src/io/flutter/actions/OpenSimulatorAction.java
@@ -5,6 +5,7 @@
  */
 package io.flutter.actions;
 
+import com.intellij.openapi.actionSystem.ActionUpdateThread;
 import com.intellij.openapi.actionSystem.AnAction;
 import com.intellij.openapi.actionSystem.AnActionEvent;
 import com.intellij.openapi.project.Project;
@@ -26,6 +27,11 @@ public void update(@NotNull AnActionEvent e) {
     e.getPresentation().setEnabled(enabled);
   }
 
+  @Override
+  public @NotNull ActionUpdateThread getActionUpdateThread() {
+    return ActionUpdateThread.BGT;
+  }
+
   @Override
   public void actionPerformed(@NotNull AnActionEvent event) {
     @Nullable final Project project = event.getProject();
diff --git a/flutter-idea/src/io/flutter/actions/RestartFlutterDaemonAction.java b/flutter-idea/src/io/flutter/actions/RestartFlutterDaemonAction.java
index 051814fef0..671eb01202 100644
--- a/flutter-idea/src/io/flutter/actions/RestartFlutterDaemonAction.java
+++ b/flutter-idea/src/io/flutter/actions/RestartFlutterDaemonAction.java
@@ -5,11 +5,13 @@
  */
 package io.flutter.actions;
 
+import com.intellij.openapi.actionSystem.ActionUpdateThread;
 import com.intellij.openapi.actionSystem.AnAction;
 import com.intellij.openapi.actionSystem.AnActionEvent;
 import com.intellij.openapi.project.Project;
 import io.flutter.FlutterInitializer;
 import io.flutter.run.daemon.DeviceService;
+import org.jetbrains.annotations.NotNull;
 
 public class RestartFlutterDaemonAction extends AnAction {
   public RestartFlutterDaemonAction() {
@@ -27,4 +29,9 @@ public void actionPerformed(AnActionEvent event) {
 
     DeviceService.getInstance(project).restart();
   }
+
+  @Override
+  public @NotNull ActionUpdateThread getActionUpdateThread() {
+    return ActionUpdateThread.BGT;
+  }
 }