3 files changed, 15 insertions, 1 deletions
diff --git a/app/scripts/lib/extension-instance.js b/app/scripts/lib/extension-instance.js
index eb3b8a1e9..d284895bc 100644
--- a/app/scripts/lib/extension-instance.js
+++ b/app/scripts/lib/extension-instance.js
@@ -42,6 +42,12 @@ function Extension () {
     } catch (e) {}
 
     try {
+      if (browser[api]) {
+        _this[api] = browser[api]
+      }
+    }
+
+    try {
       _this.api = browser.extension[api]
     } catch (e) {}
 
diff --git a/app/scripts/lib/is-popup-or-notification.js b/app/scripts/lib/is-popup-or-notification.js
new file mode 100644
index 000000000..5c38ac823
--- /dev/null
+++ b/app/scripts/lib/is-popup-or-notification.js
@@ -0,0 +1,8 @@
+module.exports = function isPopupOrNotification() {
+  const url = window.location.href
+  if (url.match(/popup.html$/)) {
+    return 'popup'
+  } else {
+    return 'notification'
+  }
+}
diff --git a/app/scripts/lib/notifications.js b/app/scripts/lib/notifications.js
index 75fb60dd0..e6bdeff09 100644
--- a/app/scripts/lib/notifications.js
+++ b/app/scripts/lib/notifications.js
@@ -31,7 +31,7 @@ function createMsgNotification (state) {
 }
 
 function showNotification() {
-  chrome.windows.create({
+  extension.windows.create({
     url:"notification.html",
     type:"panel",
     width:360,