From 7a8765a01634a97b702b2373c56fa4e36bdacc44 Mon Sep 17 00:00:00 2001
From: Antonio Scandurra <me@as-cii.com>
Date: Fri, 4 Feb 2022 16:11:48 +0100
Subject: [PATCH] Dismiss the focused find bar on `escape`

Co-Authored-By: Nathan Sobo <nathan@zed.dev>
---
 crates/find/src/find.rs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/crates/find/src/find.rs b/crates/find/src/find.rs
index 3de2234da1837b1f870ead6e5722e51afd102e3d..709f37554a3b199cb770fe1178ee8e1dcce5f670 100644
--- a/crates/find/src/find.rs
+++ b/crates/find/src/find.rs
@@ -328,10 +328,10 @@ impl FindBar {
         });
     }
 
-    fn dismiss(workspace: &mut Workspace, _: &Dismiss, cx: &mut ViewContext<Workspace>) {
-        workspace
-            .active_pane()
-            .update(cx, |pane, cx| pane.dismiss_toolbar(cx));
+    fn dismiss(pane: &mut Pane, _: &Dismiss, cx: &mut ViewContext<Pane>) {
+        if pane.toolbar::<FindBar>().is_some() {
+            pane.dismiss_toolbar(cx);
+        }
     }
 
     fn focus_editor(&mut self, _: &FocusEditor, cx: &mut ViewContext<Self>) {