diff --git a/crates/search2/src/buffer_search.rs b/crates/search2/src/buffer_search.rs
index 06e1b625bc4baaa79264467ac10c1a0a23465e63..f4f350893a484185759e8011266923d1b2eac83d 100644
--- a/crates/search2/src/buffer_search.rs
+++ b/crates/search2/src/buffer_search.rs
@@ -1,7 +1,7 @@
 use crate::{
     history::SearchHistory,
     mode::{next_mode, SearchMode},
-    search_bar::{render_nav_button, render_search_mode_button},
+    search_bar::render_nav_button,
     ActivateRegexMode, ActivateTextMode, CycleMode, NextHistoryQuery, PreviousHistoryQuery,
     ReplaceAll, ReplaceNext, SearchOptions, SelectAllMatches, SelectNextMatch, SelectPrevMatch,
     ToggleCaseSensitive, ToggleReplace, ToggleWholeWord,
@@ -21,7 +21,7 @@ use settings::Settings;
 use std::{any::Any, sync::Arc};
 use theme::ThemeSettings;
 
-use ui::{h_stack, prelude::*, Icon, IconButton, IconElement, Tooltip};
+use ui::{h_stack, prelude::*, Icon, IconButton, IconElement, ToggleButton, Tooltip};
 use util::ResultExt;
 use workspace::{
     item::ItemHandle,
@@ -165,11 +165,6 @@ impl Render for BufferSearchBar {
             editor.set_placeholder_text("Replace with...", cx);
         });
 
-        let search_button_for_mode = |mode| {
-            let is_active = self.current_mode == mode;
-
-            render_search_mode_button(mode, is_active)
-        };
         let match_count = self
             .active_searchable_item
             .as_ref()
@@ -257,8 +252,38 @@ impl Render for BufferSearchBar {
                     .flex_none()
                     .child(
                         h_stack()
-                            .child(search_button_for_mode(SearchMode::Text))
-                            .child(search_button_for_mode(SearchMode::Regex)),
+                            .child(
+                                ToggleButton::new("search-mode-text", SearchMode::Text.label())
+                                    .style(ButtonStyle::Filled)
+                                    .selected(self.current_mode == SearchMode::Text)
+                                    .on_click(cx.listener(move |_, _event, cx| {
+                                        cx.dispatch_action(SearchMode::Text.action())
+                                    }))
+                                    .tooltip(|cx| {
+                                        Tooltip::for_action(
+                                            SearchMode::Text.tooltip(),
+                                            &*SearchMode::Text.action(),
+                                            cx,
+                                        )
+                                    })
+                                    .first(),
+                            )
+                            .child(
+                                ToggleButton::new("search-mode-regex", SearchMode::Regex.label())
+                                    .style(ButtonStyle::Filled)
+                                    .selected(self.current_mode == SearchMode::Regex)
+                                    .on_click(cx.listener(move |_, _event, cx| {
+                                        cx.dispatch_action(SearchMode::Regex.action())
+                                    }))
+                                    .tooltip(|cx| {
+                                        Tooltip::for_action(
+                                            SearchMode::Regex.tooltip(),
+                                            &*SearchMode::Regex.action(),
+                                            cx,
+                                        )
+                                    })
+                                    .last(),
+                            ),
                     )
                     .when(supported_options.replacement, |this| {
                         this.child(
diff --git a/crates/search2/src/search_bar.rs b/crates/search2/src/search_bar.rs
index dcc46ac228b702f2f81f1ab99baaf3d44631ab2f..628be3112ecc06e9d00e8d33361e8f17fa6efd54 100644
--- a/crates/search2/src/search_bar.rs
+++ b/crates/search2/src/search_bar.rs
@@ -1,8 +1,6 @@
 use gpui::{Action, IntoElement};
+use ui::IconButton;
 use ui::{prelude::*, Tooltip};
-use ui::{Button, IconButton};
-
-use crate::mode::SearchMode;
 
 pub(super) fn render_nav_button(
     icon: ui::Icon,
@@ -18,19 +16,3 @@ pub(super) fn render_nav_button(
     .tooltip(move |cx| Tooltip::for_action(tooltip, action, cx))
     .disabled(!active)
 }
-
-pub(crate) fn render_search_mode_button(mode: SearchMode, is_active: bool) -> Button {
-    Button::new(mode.label(), mode.label())
-        .selected(is_active)
-        .on_click({
-            let action = mode.action();
-            move |_, cx| {
-                cx.dispatch_action(action.boxed_clone());
-            }
-        })
-        .tooltip({
-            let action = mode.action();
-            let tooltip_text = mode.tooltip();
-            move |cx| Tooltip::for_action(tooltip_text.clone(), &*action, cx)
-        })
-}