diff --git a/crates/quick_action_bar/src/quick_action_bar.rs b/crates/quick_action_bar/src/quick_action_bar.rs
index 4b41674730..f9754a4cab 100644
--- a/crates/quick_action_bar/src/quick_action_bar.rs
+++ b/crates/quick_action_bar/src/quick_action_bar.rs
@@ -282,9 +282,11 @@ impl Render for QuickActionBar {
                     .gap_1p5()
                     .children(search_button)
                     .children(editor_selections_dropdown)
-                    .when(AssistantSettings::get_global(cx).button, |bar| {
-                        bar.child(assistant_button)
-                    }),
+                    .when(
+                        AssistantSettings::get_global(cx).enabled
+                            && AssistantSettings::get_global(cx).button,
+                        |bar| bar.child(assistant_button),
+                    ),
             )
             .child(editor_settings_dropdown)
             .when_some(