diff --git a/resource/modules/AllTabs.jsm b/resource/modules/AllTabs.jsm
index 15a2c16..334ac4a 100644
--- a/resource/modules/AllTabs.jsm
+++ b/resource/modules/AllTabs.jsm
@@ -35,7 +35,6 @@ this.Tabs = {
 		return gBrowser.selectedTab;
 	},
 	set selected(tab) {
-		if(!gBrowser.getBrowserForTab(tab).frameLoader) gBrowser.getBrowserForTab(tab).frameLoader = {remoteTab: null};
 		return gBrowser.selectedTab = tab;
 	},
 
diff --git a/resource/modules/TabItems.jsm b/resource/modules/TabItems.jsm
index 3da7fc0..faa45b3 100644
--- a/resource/modules/TabItems.jsm
+++ b/resource/modules/TabItems.jsm
@@ -561,8 +561,7 @@ this.TabItem.prototype = {
 			// Tab View has been deinitialized. We can't proceed.
 			if(typeof(UI) == 'undefined') { return; }
 
-			let notSelected;
-			if(!this.tab.selected) notSelected = true;
+			let notSelected = !this.tab.selected;
 			UI.goToTab(this.tab);
 
 			if(notSelected) gBrowser.tabContainer.arrowScrollbox.ensureElementIsVisible(this.tab,true);