From 7f9b0bd5a2af0c829c8c00ee8d5e967e5fa4f9ba Mon Sep 17 00:00:00 2001
From: Cory LaViska <cory@abeautifulsite.net>
Date: Wed, 23 Nov 2022 10:38:04 -0500
Subject: [PATCH] fixes #1024

---
 docs/resources/changelog.md         | 1 +
 src/components/dropdown/dropdown.ts | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/docs/resources/changelog.md b/docs/resources/changelog.md
index 21098a0f2..46ca13791 100644
--- a/docs/resources/changelog.md
+++ b/docs/resources/changelog.md
@@ -11,6 +11,7 @@ New versions of Shoelace are released as-needed and generally occur when a criti
 ## Next
 
 - Fixed a bug that prevented `hoist` from working correctly in `<sl-dropdown>` after updating Floating UI [#1024](https://github.com/shoelace-style/shoelace/issues/1024)
+- Fixed a bug in `<sl-dropdown>` that caused containing dialogs, drawers, etc. to close when pressing <kbd>Escape</kbd> while focused [#1024](https://github.com/shoelace-style/shoelace/issues/1024)
 
 ## 2.0.0-beta.84
 
diff --git a/src/components/dropdown/dropdown.ts b/src/components/dropdown/dropdown.ts
index a72347fa2..13651784f 100644
--- a/src/components/dropdown/dropdown.ts
+++ b/src/components/dropdown/dropdown.ts
@@ -214,7 +214,8 @@ export default class SlDropdown extends ShoelaceElement {
 
   handleTriggerKeyDown(event: KeyboardEvent) {
     // Close when escape or tab is pressed
-    if (event.key === 'Escape') {
+    if (event.key === 'Escape' && this.open) {
+      event.stopPropagation();
       this.focusOnTrigger();
       this.hide();
       return;