From b00dc8378196e1c6615c66630c7962dfc92b8ddb Mon Sep 17 00:00:00 2001
From: alxflam <23746778+alxflam@users.noreply.github.com>
Date: Mon, 31 Jan 2022 16:55:25 +0100
Subject: [PATCH] fix: return focus to least recently active tab #10533
 (#10685)

---
 packages/core/src/browser/shell/application-shell.ts | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/packages/core/src/browser/shell/application-shell.ts b/packages/core/src/browser/shell/application-shell.ts
index 4167fe7ea1303..607dae503a1ad 100644
--- a/packages/core/src/browser/shell/application-shell.ts
+++ b/packages/core/src/browser/shell/application-shell.ts
@@ -1744,8 +1744,9 @@ export class ApplicationShell extends Widget {
         if (!prevBar) {
             return false;
         }
-        const len = prevBar.titles.length;
-        prevBar.currentIndex = len - 1;
+        if (!prevBar.currentTitle) {
+            prevBar.currentIndex = prevBar.titles.length - 1;
+        }
         if (prevBar.currentTitle) {
             this.activateWidget(prevBar.currentTitle.owner.id);
         }