diff --git a/src/main/java/ee/carlrobert/codegpt/actions/toolwindow/ClearChatWindowAction.java b/src/main/java/ee/carlrobert/codegpt/actions/toolwindow/ClearChatWindowAction.java
index 04933ed9..682e0740 100644
--- a/src/main/java/ee/carlrobert/codegpt/actions/toolwindow/ClearChatWindowAction.java
+++ b/src/main/java/ee/carlrobert/codegpt/actions/toolwindow/ClearChatWindowAction.java
@@ -2,15 +2,14 @@ package ee.carlrobert.codegpt.actions.toolwindow;
 
 import com.intellij.icons.AllIcons;
 import com.intellij.openapi.actionSystem.ActionUpdateThread;
-import com.intellij.openapi.actionSystem.AnAction;
 import com.intellij.openapi.actionSystem.AnActionEvent;
+import com.intellij.openapi.project.DumbAwareAction;
 import ee.carlrobert.codegpt.actions.ActionType;
 import ee.carlrobert.codegpt.actions.editor.EditorActionsUtil;
-import ee.carlrobert.codegpt.conversations.ConversationsState;
 import ee.carlrobert.codegpt.telemetry.TelemetryAction;
 import org.jetbrains.annotations.NotNull;
 
-public class ClearChatWindowAction extends AnAction {
+public class ClearChatWindowAction extends DumbAwareAction {
 
   private final Runnable onActionPerformed;
 
@@ -20,14 +19,6 @@ public class ClearChatWindowAction extends AnAction {
     EditorActionsUtil.registerAction(this);
   }
 
-  @Override
-  public void update(@NotNull AnActionEvent event) {
-    super.update(event);
-    var currentConversation = ConversationsState.getCurrentConversation();
-    var isEnabled = currentConversation != null && !currentConversation.getMessages().isEmpty();
-    event.getPresentation().setEnabled(isEnabled);
-  }
-
   @Override
   public void actionPerformed(@NotNull AnActionEvent event) {
     try {