diff --git a/App/Browser View/BrowserViewController.swift b/App/Browser View/BrowserViewController.swift
index 46d2083..e85287d 100644
--- a/App/Browser View/BrowserViewController.swift	
+++ b/App/Browser View/BrowserViewController.swift	
@@ -609,12 +609,8 @@ class BrowserViewController: UIViewController, WKNavigationDelegate, WKUIDelegat
     }
     
     func tabPicker(_ picker: TabPickerViewController, willCloseTab tab: Tab) {
-        // If closed tab is current tab, pick another one.
+        // Dismiss picker if current tab is closed using the picker
         if tab == self.tab {
-            if let nextTab = tabController.tabs.last(where: { $0 != tab }) {
-                self.tab = nextTab
-            }
-            
             picker.dismiss(animated: true, completion: nil)
         }
     }
diff --git a/App/Tabs/TabController.swift b/App/Tabs/TabController.swift
index f698340..0017c9c 100644
--- a/App/Tabs/TabController.swift
+++ b/App/Tabs/TabController.swift
@@ -43,7 +43,11 @@ class TabController
             tabs.remove(at: index)
             
             if tabs.count > 0 {
-                activeTabIndex = tabs.count - 1
+                if index < tabs.count {
+                    activeTabIndex = index
+                } else {
+                    activeTabIndex = tabs.count - 1
+                }
             } else {
                 _ = createNewTab(url: nil)
                 activeTabIndex = 0