From 029b1d999b0999358ca446315668caf9a9bdfc25 Mon Sep 17 00:00:00 2001
From: WBHarry <williambjrklund@gmail.com>
Date: Tue, 11 Nov 2025 21:47:51 +0100
Subject: [PATCH] .

---
 module/applications/ui/countdowns.mjs | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/module/applications/ui/countdowns.mjs b/module/applications/ui/countdowns.mjs
index 3d0b32ae..b7d19ede 100644
--- a/module/applications/ui/countdowns.mjs
+++ b/module/applications/ui/countdowns.mjs
@@ -81,6 +81,13 @@ export default class DhCountdowns extends HandlebarsApplicationMixin(Application
         return frame;
     }
 
+    /**@inheritdoc */
+    async _onFirstRender(context, options) {
+        await super._onFirstRender(context, options);
+
+        this.toggleCollapsedPosition(undefined, !ui.sidebar.expanded);
+    }
+
     /** @override */
     async _prepareContext(options) {
         const context = await super._prepareContext(options);
@@ -124,6 +131,8 @@ export default class DhCountdowns extends HandlebarsApplicationMixin(Application
     }
 
     toggleCollapsedPosition = async (_, collapsed) => {
+        if (!this.element) return;
+
         this.sidebarCollapsed = collapsed;
         if (!collapsed) this.element.classList.add('expanded');
         else this.element.classList.remove('expanded');
@@ -188,10 +197,13 @@ export default class DhCountdowns extends HandlebarsApplicationMixin(Application
         Hooks.on(socketEvent.Refresh, this.cooldownRefresh.bind());
     }
 
-    close(options) {
+    async close(options) {
+        /* Opt out of Foundry's standard behavior of closing all application windows marked as UI when Escape is pressed */
+        if (options.closeKey) return;
+
         Hooks.off('collapseSidebar', this.toggleCollapsedPosition);
         Hooks.off(socketEvent.Refresh, this.cooldownRefresh);
-        super.close(options);
+        return super.close(options);
     }
 
     static async updateCountdowns(progressType) {