From eb612113ea941a8e6b0f3873b1a51b43ea29605d Mon Sep 17 00:00:00 2001
From: Marcel Werk <burntime@woltlab.com>
Date: Fri, 20 Mar 2026 22:30:53 +0100
Subject: [PATCH] Fix issue that the already open attachment tab was closed
 when uploading via drag and drop

---
 ts/WoltLabSuite/Core/Component/Attachment/List.ts            | 5 ++++-
 .../files/js/WoltLabSuite/Core/Component/Attachment/List.js  | 5 ++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/ts/WoltLabSuite/Core/Component/Attachment/List.ts b/ts/WoltLabSuite/Core/Component/Attachment/List.ts
index 237d9f9583..0f909ad0f7 100644
--- a/ts/WoltLabSuite/Core/Component/Attachment/List.ts
+++ b/ts/WoltLabSuite/Core/Component/Attachment/List.ts
@@ -98,7 +98,10 @@ export function setup(editorId: string): void {
         return;
       }
 
-      getTabMenu(editorId)?.setActiveTab("attachments");
+      const menu = getTabMenu(editorId);
+      if (menu !== undefined && menu.activeTabName !== "attachments") {
+        menu.setActiveTab("attachments");
+      }
     })
     .collectMetaData((payload) => {
       let context: Context | undefined = undefined;
diff --git a/wcfsetup/install/files/js/WoltLabSuite/Core/Component/Attachment/List.js b/wcfsetup/install/files/js/WoltLabSuite/Core/Component/Attachment/List.js
index 62c3d8ab66..fc8ad0e8a7 100644
--- a/wcfsetup/install/files/js/WoltLabSuite/Core/Component/Attachment/List.js
+++ b/wcfsetup/install/files/js/WoltLabSuite/Core/Component/Attachment/List.js
@@ -76,7 +76,10 @@ define(["require", "exports", "tslib", "./Entry", "../Ckeditor/Event", "../Messa
             if (messageTabMenu === null) {
                 return;
             }
-            (0, MessageTabMenu_1.getTabMenu)(editorId)?.setActiveTab("attachments");
+            const menu = (0, MessageTabMenu_1.getTabMenu)(editorId);
+            if (menu !== undefined && menu.activeTabName !== "attachments") {
+                menu.setActiveTab("attachments");
+            }
         })
             .collectMetaData((payload) => {
             let context = undefined;