diff --git a/crates/assistant/src/assistant.rs b/crates/assistant/src/assistant.rs
index d262ffd57d..ae01db5ade 100644
--- a/crates/assistant/src/assistant.rs
+++ b/crates/assistant/src/assistant.rs
@@ -1,5 +1,5 @@
 pub mod assistant_panel;
-mod assistant_settings;
+pub mod assistant_settings;
 mod codegen;
 mod prompts;
 mod streaming_diff;
diff --git a/crates/quick_action_bar/src/quick_action_bar.rs b/crates/quick_action_bar/src/quick_action_bar.rs
index b7c783b344..75d35fd4f8 100644
--- a/crates/quick_action_bar/src/quick_action_bar.rs
+++ b/crates/quick_action_bar/src/quick_action_bar.rs
@@ -1,3 +1,4 @@
+use assistant::assistant_settings::AssistantSettings;
 use assistant::{AssistantPanel, InlineAssist};
 use editor::{Editor, EditorSettings};
 
@@ -126,7 +127,9 @@ impl Render for QuickActionBar {
             .gap_2()
             .children(inlay_hints_button)
             .children(search_button)
-            .child(assistant_button)
+            .when(AssistantSettings::get_global(cx).button, |bar| {
+                bar.child(assistant_button)
+            })
     }
 }