diff --git a/mobile/android/base/Tabs.java b/mobile/android/base/Tabs.java index ef79baa3a3f7..b66069dbdb11 100644 --- a/mobile/android/base/Tabs.java +++ b/mobile/android/base/Tabs.java @@ -157,8 +157,6 @@ public class Tabs implements GeckoEventListener { if (tab == null || nextTab == null) return; - selectTab(nextTab.getId()); - int tabId = tab.getId(); removeTab(tabId); tab.onDestroy(); @@ -171,6 +169,9 @@ public class Tabs implements GeckoEventListener { // Pass a message to Gecko to update tab state in BrowserApp GeckoAppShell.sendEventToGecko(GeckoEvent.createBroadcastEvent("Tab:Closed", String.valueOf(tabId))); + + // Next tab selection should happen after closing the tab. + selectTab(nextTab.getId()); } /** Return the tab that will be selected by default after this one is closed */