diff --git a/src/ui/URLMaps.js b/src/ui/URLMaps.js
index 76315da..4e08511 100644
--- a/src/ui/URLMaps.js
+++ b/src/ui/URLMaps.js
@@ -1,5 +1,6 @@
 import State from '../State';
 import Storage from '../Storage';
+import {NO_CONTAINER} from '../ContextualIdentity';
 import Tabs from '../Tabs';
 import {qs, qsAll} from '../utils';
 import {showLoader, hideLoader} from './loader';
@@ -38,11 +39,17 @@ class URLMaps {
 
     for (const key in this.state.urlMaps) {
       const urlMap = this.state.urlMaps[key];
-      if (this.state.selectedIdentity.cookieStoreId === urlMap.cookieStoreId) {
-        this.addItem(urlMap.host);
+      if (urlMap.cookieStoreId !== NO_CONTAINER.cookieStoreId) {
+        if (this.state.selectedIdentity.cookieStoreId === urlMap.cookieStoreId) {
+          this.addItem(urlMap.host);
+        }
       }
     }
 
+    let isDefaultContainer = this.state.selectedIdentity.cookieStoreId === NO_CONTAINER.cookieStoreId;
+    addButton.style.display = isDefaultContainer ? 'none' : 'initial';
+    saveButton.style.display = isDefaultContainer ? 'none' : 'initial';
+
     hideLoader();
   }
 
diff --git a/src/webRequestListener.js b/src/webRequestListener.js
index 6dc8cae..d248e1a 100644
--- a/src/webRequestListener.js
+++ b/src/webRequestListener.js
@@ -39,6 +39,11 @@ export const webRequestListener = (requestDetails) => {
     const hostIdentity = identities.find((identity) => identity.cookieStoreId === hostMap.cookieStoreId);
     const tabIdentity = identities.find((identity) => identity.cookieStoreId === currentTab.cookieStoreId);
 
+    if (!hostIdentity && currentTab.cookieStoreId !== NO_CONTAINER.cookieStoreId && tabIdentity) {
+      return createTab(requestDetails.url, currentTab.index + 1, currentTab.id);
+    }
+
+
     if (!hostIdentity) {
       return {};
     }