diff --git a/app/src/layout/Wnd.ts b/app/src/layout/Wnd.ts
index 70436f961..b4dff742a 100644
--- a/app/src/layout/Wnd.ts
+++ b/app/src/layout/Wnd.ts
@@ -784,7 +784,19 @@ export class Wnd {
                     return true;
                 }
             });
-            oldWnd.switchTab(oldWnd.children[oldWnd.children.length - 1].headElement);
+            if (!oldWnd.headersElement.querySelector(".item--focus")) {
+                let latestHeadElement: HTMLElement;
+                Array.from(oldWnd.headersElement.children).forEach((headItem: HTMLElement) => {
+                    if (!latestHeadElement) {
+                        latestHeadElement = headItem;
+                    } else if (headItem.getAttribute("data-activetime") > latestHeadElement.getAttribute("data-activetime")) {
+                        latestHeadElement = headItem;
+                    }
+                });
+                if (latestHeadElement) {
+                    oldWnd.switchTab(latestHeadElement, true);
+                }
+            }
         }
         tab.parent = this;
         resizeTabs();