diff --git a/clients/intellij/src/main/kotlin/com/tabbyml/intellijtabby/status/StatusBarWidgetFactory.kt b/clients/intellij/src/main/kotlin/com/tabbyml/intellijtabby/status/StatusBarWidgetFactory.kt
index d23d79f..e85e9b0 100644
--- a/clients/intellij/src/main/kotlin/com/tabbyml/intellijtabby/status/StatusBarWidgetFactory.kt
+++ b/clients/intellij/src/main/kotlin/com/tabbyml/intellijtabby/status/StatusBarWidgetFactory.kt
@@ -119,8 +119,13 @@ class StatusBarWidgetFactory : StatusBarEditorBasedWidgetFactory() {
             } else {
               when (state.settings.completionTriggerMode) {
                 ApplicationSettingsState.TriggerMode.AUTOMATIC -> {
-                  icon = AllIcons.Actions.Checked
-                  tooltip = "Tabby: Automatic code completion is enabled"
+                  if (state.ongoingCompletion == null) {
+                    icon = AllIcons.Actions.Checked
+                    tooltip = "Tabby: Automatic code completion is enabled"
+                  } else {
+                    icon = AnimatedIcon.Default()
+                    tooltip = "Tabby: Generating code completions"
+                  }
                 }
 
                 ApplicationSettingsState.TriggerMode.MANUAL -> {