diff --git a/background.html b/background.html
index c87572b35f..c583527652 100644
--- a/background.html
+++ b/background.html
@@ -153,7 +153,6 @@
   <script type="text/x-tmpl-mustache" id="inbox">
     <div class='title-bar' id='header'>
       <div class='socket-status'></div>
-      <button class='popout hide'></button>
     </div>
     <div class='gutter'>
         <div class='conversations scrollable'></div>
diff --git a/images/popout.png b/images/popout.png
deleted file mode 100644
index 2f648740ba..0000000000
Binary files a/images/popout.png and /dev/null differ
diff --git a/js/background.js b/js/background.js
index 00d60f9587..858d6eb886 100644
--- a/js/background.js
+++ b/js/background.js
@@ -65,6 +65,8 @@
             });
         });
 
+        extension.browserAction(window.openInbox);
+
         // refresh views
         var views = extension.windows.getViews();
         for (var i = 0; i < views.length; ++i) {
diff --git a/js/index.js b/js/index.js
index 81cedf4964..4b67276e4d 100644
--- a/js/index.js
+++ b/js/index.js
@@ -20,23 +20,10 @@
 
     window.Whisper = window.Whisper || {};
     if (bg.textsecure.storage.getUnencrypted("number_id") === undefined) {
-        extension.navigator.tabs.create('/options.html');
-        window.close();
+        window.location = '/options.html';
     } else {
         new bg.Whisper.InboxView().$el.prependTo(bg.$('body',document));
         bg.textsecure.storage.putUnencrypted("unreadCount", 0);
         extension.navigator.setBadgeText("");
-
-        window.addEventListener('beforeunload', function () {
-            chrome.browserAction.setPopup({popup: 'index.html'}); // pop in
-        });
-
-        extension.windows.getCurrent(function (windowInfo) {
-            if (windowInfo.type === 'normal') {
-                bg.$('body', document).addClass('pop-in');
-            } else {
-                bg.$('.popout', document).remove();
-            }
-        });
     }
 }());
diff --git a/js/panel_controller.js b/js/panel_controller.js
index 0747db6a55..4e0f6d3d7c 100644
--- a/js/panel_controller.js
+++ b/js/panel_controller.js
@@ -133,12 +133,6 @@
         }
     };
 
-    window.popoutInbox = function() {
-        chrome.browserAction.setPopup({popup: ''});
-        extension.browserAction(window.openInbox);
-        window.openInbox();
-    };
-
     // make sure windows are cleaned up on close
     extension.windows.onClosed(function (windowId) {
         if (windowMap.windowId[windowId]) {
diff --git a/js/views/inbox_view.js b/js/views/inbox_view.js
index bd86bbb3a0..89f2b68ee1 100644
--- a/js/views/inbox_view.js
+++ b/js/views/inbox_view.js
@@ -80,10 +80,6 @@
         events: {
             'click .fab': 'showCompose',
             'select .contact': 'openConversation',
-            'click .popout': 'popout'
-        },
-        popout: function() {
-            bg.popoutInbox();
         },
         openConversation: function(e, data) {
             bg.openConversation(data.modelId);
diff --git a/manifest.json b/manifest.json
index 3ce1a8699f..1dc8c7085d 100644
--- a/manifest.json
+++ b/manifest.json
@@ -16,8 +16,7 @@
         "default_icon": {
             "19": "images/icon.png"
         },
-        "default_title": "TextSecure",
-        "default_popup": "index.html"
+        "default_title": "TextSecure"
     },
 
     "background": {
diff --git a/stylesheets/_index.scss b/stylesheets/_index.scss
index 2675765023..c0ba5f8dc1 100644
--- a/stylesheets/_index.scss
+++ b/stylesheets/_index.scss
@@ -95,11 +95,6 @@ input.search {
 }
 
 .index {
-  &.pop-in {
-    min-height: 330px;
-    min-width: 260px;
-  }
-
   color: $grey_d;
   background: #eee;
 
@@ -141,12 +136,3 @@ input.search {
       font-weight: bold;
     }
 }
-
-.popout {
-  float: right;
-  background: url('/images/popout.png') no-repeat center center;
-  display: none;
-}
-.title-bar:hover .popout {
-  display: inline-block;
-}
diff --git a/stylesheets/manifest.css b/stylesheets/manifest.css
index 0d649d8273..d131842b49 100644
--- a/stylesheets/manifest.css
+++ b/stylesheets/manifest.css
@@ -320,9 +320,6 @@ input.search {
 .index {
   color: #454545;
   background: #eee; }
-  .index.pop-in {
-    min-height: 330px;
-    min-width: 260px; }
   .index .new-group-update-form {
     display: none;
     padding: 0.5em; }
@@ -349,14 +346,6 @@ input.search {
 .conversations .unread .contact-details .last-timestamp {
   font-weight: bold; }
 
-.popout {
-  float: right;
-  background: url("/images/popout.png") no-repeat center center;
-  display: none; }
-
-.title-bar:hover .popout {
-  display: inline-block; }
-
 .conversation {
   padding: 36px 0; }
   .conversation .file-input .close {