diff --git a/frontend/src/components/AppBridge.tsx b/frontend/src/components/AppBridge.tsx
deleted file mode 100644
index f8d05786..00000000
--- a/frontend/src/components/AppBridge.tsx
+++ /dev/null
@@ -1,11 +0,0 @@
-import { useEffect } from 'react';
-import { App } from 'antd';
-import { setMessageInstance } from '@/utils/messageBus';
-
-export default function AppBridge({ children }: { children: React.ReactNode }) {
-  const { message } = App.useApp();
-  useEffect(() => {
-    setMessageInstance(message);
-  }, [message]);
-  return <>{children}</>;
-}
diff --git a/frontend/src/pages/clients/ClientQrModal.tsx b/frontend/src/pages/clients/ClientQrModal.tsx
index 731489ee..6263414a 100644
--- a/frontend/src/pages/clients/ClientQrModal.tsx
+++ b/frontend/src/pages/clients/ClientQrModal.tsx
@@ -71,13 +71,7 @@ export default function ClientQrModal({
     return () => { cancelled = true; };
   }, [open, client?.subId]);
 
-  const activeKeys = useMemo(() => {
-    const keys: string[] = [];
-    if (subLink) keys.push('sub');
-    if (subJsonLink) keys.push('subJson');
-    if (links.length > 0) keys.push('l0');
-    return keys;
-  }, [subLink, subJsonLink, links.length]);
+  const [activeKey, setActiveKey] = useState<string[]>([]);
 
   const items = useMemo(() => {
     const out: { key: string; label: string; children: React.ReactNode }[] = [];
@@ -105,6 +99,14 @@ export default function ClientQrModal({
     return out;
   }, [subLink, subJsonLink, links, client?.email, t]);
 
+  useEffect(() => {
+    if (!open) {
+      setActiveKey([]);
+      return;
+    }
+    setActiveKey(items.length > 0 ? [items[0].key] : []);
+  }, [open, items]);
+
   return (
     <Modal
       open={open}
@@ -121,7 +123,13 @@ export default function ClientQrModal({
         {client?.subId && !hasAnything && !loading && (
           <div style={{ padding: 24, textAlign: 'center', opacity: 0.6 }}>{t('pages.clients.noLinks')}</div>
         )}
-        {hasAnything && <Collapse activeKey={activeKeys} accordion={false} items={items} />}
+        {hasAnything && (
+          <Collapse
+            activeKey={activeKey}
+            onChange={(keys) => setActiveKey(typeof keys === 'string' ? [keys] : (keys as string[]))}
+            items={items}
+          />
+        )}
       </Spin>
     </Modal>
   );
diff --git a/frontend/src/pages/inbounds/QrCodeModal.tsx b/frontend/src/pages/inbounds/QrCodeModal.tsx
index 7eed15dd..f4fae390 100644
--- a/frontend/src/pages/inbounds/QrCodeModal.tsx
+++ b/frontend/src/pages/inbounds/QrCodeModal.tsx
@@ -57,7 +57,7 @@ export default function QrCodeModal({
   const [wireguardLinks, setWireguardLinks] = useState<string[]>([]);
   const [subLink, setSubLink] = useState('');
   const [subJsonLink, setSubJsonLink] = useState('');
-  const [defaultActive, setDefaultActive] = useState<string[]>([]);
+  const [activeKey, setActiveKey] = useState<string[]>([]);
 
   useEffect(() => {
     if (!open || !dbInbound) return;
@@ -84,7 +84,6 @@ export default function QrCodeModal({
     }
     setSubLink(nextSub);
     setSubJsonLink(nextSubJson);
-    setDefaultActive(nextSub ? ['sub'] : []);
   }, [open, dbInbound, client, remarkModel, nodeAddress, subSettings]);
 
   const qrItems = useMemo<QrItem[]>(() => {
@@ -128,13 +127,21 @@ export default function QrCodeModal({
     [qrItems],
   );
 
+  useEffect(() => {
+    if (!open) {
+      setActiveKey([]);
+      return;
+    }
+    setActiveKey(qrItems.length > 0 ? [qrItems[0].key] : []);
+  }, [open, qrItems]);
+
   return (
     <Modal open={open} onCancel={onClose} title={t('qrCode')} footer={null} width={420} destroyOnHidden>
       {dbInbound && collapseItems && collapseItems.length > 0 && (
         <Collapse
-          key={collapseItems.map((i) => i?.key).join('|')}
           ghost
-          defaultActiveKey={defaultActive}
+          activeKey={activeKey}
+          onChange={(keys) => setActiveKey(typeof keys === 'string' ? [keys] : (keys as string[]))}
           items={collapseItems}
         />
       )}