diff --git a/src/main/java/edu/berkeley/cs61b/plugin/CheckStyleAction.java b/src/main/java/edu/berkeley/cs61b/plugin/CheckStyleAction.java
index 76b18d9..882a296 100644
--- a/src/main/java/edu/berkeley/cs61b/plugin/CheckStyleAction.java
+++ b/src/main/java/edu/berkeley/cs61b/plugin/CheckStyleAction.java
@@ -1,8 +1,24 @@
 package edu.berkeley.cs61b.plugin;
 
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.LinkedList;
+import java.util.List;
+
+import org.jetbrains.annotations.NotNull;
+import org.xml.sax.InputSource;
+
 import com.intellij.execution.filters.OpenFileHyperlinkInfo;
 import com.intellij.execution.ui.ConsoleView;
 import com.intellij.execution.ui.ConsoleViewContentType;
+import com.intellij.openapi.actionSystem.ActionUpdateThread;
 import com.intellij.openapi.actionSystem.AnAction;
 import com.intellij.openapi.actionSystem.AnActionEvent;
 import com.intellij.openapi.actionSystem.CommonDataKeys;
@@ -20,19 +36,6 @@
 import com.puppycrawl.tools.checkstyle.api.AuditEvent;
 import com.puppycrawl.tools.checkstyle.api.AuditListener;
 import com.puppycrawl.tools.checkstyle.api.Configuration;
-import org.xml.sax.InputSource;
-
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.LinkedList;
-import java.util.List;
 
 public class CheckStyleAction extends AnAction {
 	private static final String CONFIG_ROOT = "style_config/";
@@ -84,6 +87,11 @@ public void actionPerformed(AnActionEvent event) {
 		}
 	}
 
+	@Override
+	public @NotNull ActionUpdateThread getActionUpdateThread() {
+		return ActionUpdateThread.BGT;
+	}
+
 	private void collectFiles(VirtualFile[] parent, List<File> list) {
 		LinkedList<VirtualFile> sources = new LinkedList<>();
 		Collections.addAll(sources, parent);
@@ -222,4 +230,4 @@ public void addError(AuditEvent e) {
 		public void addException(AuditEvent e, Throwable throwable) {
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/src/main/java/edu/berkeley/cs61b/plugin/SettingsAction.java b/src/main/java/edu/berkeley/cs61b/plugin/SettingsAction.java
index ed9c61b..7c19d4b 100644
--- a/src/main/java/edu/berkeley/cs61b/plugin/SettingsAction.java
+++ b/src/main/java/edu/berkeley/cs61b/plugin/SettingsAction.java
@@ -1,10 +1,12 @@
 package edu.berkeley.cs61b.plugin;
 
+import org.jetbrains.annotations.NotNull;
+
 import com.intellij.ide.util.PropertiesComponent;
+import com.intellij.openapi.actionSystem.ActionUpdateThread;
 import com.intellij.openapi.actionSystem.AnAction;
 import com.intellij.openapi.actionSystem.AnActionEvent;
 import com.intellij.openapi.ui.DialogWrapper;
-import org.jetbrains.annotations.NotNull;
 
 public class SettingsAction extends AnAction {
 	@Override
@@ -19,4 +21,9 @@ public void actionPerformed(@NotNull AnActionEvent e) {
 			props.setValue(PluginUtils.KEY_SEMESTER, form.getSemesterField().getText());
 		}
 	}
-}
+
+	@Override
+	public @NotNull ActionUpdateThread getActionUpdateThread() {
+		return ActionUpdateThread.BGT;
+	}
+}
\ No newline at end of file