diff --git a/js/background.js b/js/background.js
index 3c2e05fb7..7df69a7c6 100644
--- a/js/background.js
+++ b/js/background.js
@@ -65,8 +65,6 @@
             });
         });
 
-        extension.browserAction(window.openInbox);
-
         // refresh views
         var views = extension.windows.getViews();
         for (var i = 0; i < views.length; ++i) {
diff --git a/js/panel_controller.js b/js/panel_controller.js
index f02e07a3c..a4c1ab34a 100644
--- a/js/panel_controller.js
+++ b/js/panel_controller.js
@@ -110,7 +110,7 @@
     /* Inbox window controller */
     var inboxOpened = false;
     var inboxWindowId = 0;
-    window.openInbox = function() {
+    extension.browserAction(function() {
         if (inboxOpened === false) {
             inboxOpened = true;
             extension.windows.open({
@@ -131,7 +131,7 @@
         } else if (inboxOpened === true) {
             extension.windows.focus(inboxWindowId);
         }
-    };
+    });
 
     // make sure windows are cleaned up on close
     extension.windows.onClosed(function (windowId) {