diff --git a/app/browser/tabs.js b/app/browser/tabs.js
index b5e0da8b6c4..067d4d7fbdc 100644
--- a/app/browser/tabs.js
+++ b/app/browser/tabs.js
@@ -626,7 +626,7 @@ const api = {
         // forget last active trail in window tab
         // is detaching from
         const oldTab = getTabValue(oldTabId)
-        const detachedFromWindowId = oldTab.get('windowId')
+        const detachedFromWindowId = oldTab ? oldTab.get('windowId') : undefined
         if (detachedFromWindowId != null) {
           activeTabHistory.clearTabFromWindow(detachedFromWindowId, oldTabId)
         }
diff --git a/app/extensions.js b/app/extensions.js
index da3e692104c..509b6382b28 100644
--- a/app/extensions.js
+++ b/app/extensions.js
@@ -294,6 +294,14 @@ let generateEthwalletManifest = () => {
       48: 'ethereum-48.png',
       16: 'ethereum-16.png'
     },
+    browser_action: {
+      default_icon: {
+        38: 'ethereum-48.png',
+        19: 'ethereum-16.png'
+      },
+      default_popup: 'index.html',
+      default_title: 'Ethereum Wallet'
+    },
     incognito: 'split',
     key: 'MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAzrdMUtpj4PkN7uoeRC7pXsJyNC65iCWJObISzDQ/mCXerD3ATL54Y8TCkE1mS9O2tiZFY+og4g0GqLjT/M9GJ/Rjlj6cQqIaa9MnQ65H789V6rqPlTQyrd3udIylPJbr5aJ9RvuMcX8BKpT7SKcYvRSwZblKQ/OZ/a/5ylfM+QPyS5ZzooEq921I8eB4JF80aic/3cdU+Xmpyo/jdEe804/MemQ6kqlErXdNaFVU7fQ3lvCzWWcI+I3A1QbKSC2+G1HiToxllxU1gv+rAOsoHYwSkL2ZBTPkvnVBuV5vTS91GF3jGF9TMbw4m3TRNPJZkU32nfJy2JNaa1Ssnws+bQIDAQAB'
   }