diff --git a/crates/ui2/src/components/button/button_like.rs b/crates/ui2/src/components/button/button_like.rs
index 4bef6bff774571047dd1519c18b7ec61b32f1904..1a33eb2845eef9e767181bb2cc5f65ba7eb8957f 100644
--- a/crates/ui2/src/components/button/button_like.rs
+++ b/crates/ui2/src/components/button/button_like.rs
@@ -359,11 +359,7 @@ impl RenderOnce for ButtonLike {
                 },
             )
             .when_some(self.tooltip, |this, tooltip| {
-                if !self.selected {
-                    this.tooltip(move |cx| tooltip(cx))
-                } else {
-                    this
-                }
+                this.tooltip(move |cx| tooltip(cx))
             })
             .children(self.children)
     }
diff --git a/crates/ui2/src/components/stories/icon_button.rs b/crates/ui2/src/components/stories/icon_button.rs
index 3c4d68f8aff5500225be0f6cf83c096a5c6c6dff..583f453d188b9df5aaaf71b5bb1897814c0a6f51 100644
--- a/crates/ui2/src/components/stories/icon_button.rs
+++ b/crates/ui2/src/components/stories/icon_button.rs
@@ -51,5 +51,13 @@ impl Render for IconButtonStory {
                         .tooltip(|cx| Tooltip::text("Open messages", cx)),
                 ),
             )
+            .child(Story::label("Selected with `tooltip`"))
+            .child(
+                div().w_8().child(
+                    IconButton::new("selected_with_tooltip", Icon::InlayHint)
+                        .selected(true)
+                        .tooltip(|cx| Tooltip::text("Toggle inlay hints", cx)),
+                ),
+            )
     }
 }