diff --git a/app/pnpm-lock.yaml b/app/pnpm-lock.yaml
index 44abca6f1..67de91046 100644
--- a/app/pnpm-lock.yaml
+++ b/app/pnpm-lock.yaml
@@ -1906,10 +1906,10 @@ packages:
     resolution: {integrity: sha512-m0+M53+HYMzqKxwNQZT143K7WwXEGUy9LY31l8dJphXx2P/FQod615mVbxHyqbDCG4J5bHdWm21qZ0e2DVY6CQ==}
     engines: {node: '>=14.0.0'}
     dependencies:
-      7zip-bin: 5.1.1
       '@develar/schema-utils': 2.6.5
       '@electron/universal': 1.2.1
       '@malept/flatpak-bundler': 0.4.0
+      7zip-bin: 5.1.1
       async-exit-hook: 2.0.1
       bluebird-lst: 1.0.9
       builder-util: 23.3.3
@@ -2193,9 +2193,9 @@ packages:
   /builder-util/23.3.3:
     resolution: {integrity: sha512-MJZlUiq2PY5hjYv9+XNaoYdsITqvLgRDoHSFg/4nzpInbNxNjLQOolL04Zsyp+hgfcbFvMC4h0KkR1CMPHLWbA==}
     dependencies:
-      7zip-bin: 5.1.1
       '@types/debug': 4.1.7
       '@types/fs-extra': 9.0.13
+      7zip-bin: 5.1.1
       app-builder-bin: 4.0.0
       bluebird-lst: 1.0.9
       builder-util-runtime: 9.0.3
diff --git a/app/src/editor/util.ts b/app/src/editor/util.ts
index 5c3166c33..51b44fd8c 100644
--- a/app/src/editor/util.ts
+++ b/app/src/editor/util.ts
@@ -349,7 +349,7 @@ export const updatePanelByEditor = (protyle?: IProtyle, focus = true, pushBackSt
 };
 
 export const isCurrentEditor = (blockId: string) => {
-    const activeElement = document.querySelector(".layout__wnd--active > .layout-tab-bar > .item--focus");
+    const activeElement = document.querySelector(".layout__wnd--active > .fn__flex > .layout-tab-bar > .item--focus");
     if (activeElement) {
         const tab = getInstanceById(activeElement.getAttribute("data-id"));
         if (tab instanceof Tab && tab.model instanceof Editor) {
diff --git a/app/src/layout/Wnd.ts b/app/src/layout/Wnd.ts
index 572927640..1727e7a51 100644
--- a/app/src/layout/Wnd.ts
+++ b/app/src/layout/Wnd.ts
@@ -742,6 +742,10 @@ export class Wnd {
                             previous.element.style.height = (previous.element.clientHeight + element.clientHeight) + "px";
                         }
                     }
+                    // https://github.com/siyuan-note/siyuan/issues/5844
+                    if (layout.children.length > 2 && index === 0) {
+                        layout.children[1].resize = undefined;
+                    }
                 }
                 layout.children.splice(index, 1);
                 return true;
diff --git a/app/src/layout/dock/Files.ts b/app/src/layout/dock/Files.ts
index 93f40d53a..5175ad8a4 100644
--- a/app/src/layout/dock/Files.ts
+++ b/app/src/layout/dock/Files.ts
@@ -162,7 +162,7 @@ export class Files extends Model {
                     window.siyuan.menus.menu.remove();
                     break;
                 } else if (type === "focus") {
-                    const element = document.querySelector(".layout__wnd--active > .layout-tab-bar > .item--focus") ||
+                    const element = document.querySelector(".layout__wnd--active > .fn__flex > .layout-tab-bar > .item--focus") ||
                         document.querySelector(".layout-tab-bar > .item--focus");
                     if (element) {
                         const tab = getInstanceById(element.getAttribute("data-id")) as Tab;
diff --git a/app/src/util/globalShortcut.ts b/app/src/util/globalShortcut.ts
index d3b109d03..0bf2e35fb 100644
--- a/app/src/util/globalShortcut.ts
+++ b/app/src/util/globalShortcut.ts
@@ -809,7 +809,7 @@ const fileTreeKeydown = (event: KeyboardEvent) => {
     if (matchHotKey(window.siyuan.config.keymap.general.selectOpen1.custom, event)) {
         event.preventDefault();
         event.stopPropagation();
-        const element = document.querySelector(".layout__wnd--active > .layout-tab-bar > .item--focus") ||
+        const element = document.querySelector(".layout__wnd--active > .fn__flex > .layout-tab-bar > .item--focus") ||
             document.querySelector(".layout-tab-bar > .item--focus");
         if (element) {
             const tab = getInstanceById(element.getAttribute("data-id")) as Tab;