diff --git a/platform/firefox/vapi-background.js b/platform/firefox/vapi-background.js
index 58f3d4cc1..c5c457d7c 100644
--- a/platform/firefox/vapi-background.js
+++ b/platform/firefox/vapi-background.js
@@ -1326,7 +1326,9 @@ vAPI.net.registerListeners = function() {
         var details = e.data;
         var browser = e.target;
         var tabId = vAPI.tabs.getTabId(browser);
-        
+        if (tabId === vAPI.noTabId) {
+            return; // Do not navigate for behind the scenes
+        }
         //console.debug("nsIWebProgressListener: onLocationChange: " + details.url + " (" + details.flags + ")");        
 
         // LOCATION_CHANGE_SAME_DOCUMENT = "did not load a new document"
diff --git a/src/js/popup.js b/src/js/popup.js
index 9317f38f5..5ed3049d0 100644
--- a/src/js/popup.js
+++ b/src/js/popup.js
@@ -743,7 +743,7 @@ uDom.onLoad(function () {
     var tabId = null; //If there's no tab ID specified in the query string, it will default to current tab.
 
     // Extract the tab id of the page this popup is for
-    var matches = window.location.search.match(/[\?&]tabId=([^&]+)/);
+    var matches = window.location && window.location.search.match(/[\?&]tabId=([^&]+)/);
     if (matches && matches.length === 2) {
         tabId = matches[1];
     }