diff --git a/js/panel_controller.js b/js/panel_controller.js
index aefc3a0a2..4e75d05cd 100644
--- a/js/panel_controller.js
+++ b/js/panel_controller.js
@@ -86,11 +86,10 @@
 
     window.notifyConversation = function(message) {
         var conversationId = message.get('conversationId');
-        var windowId = windowMap.windowIdFrom(conversationId);
-        if (windowId) {
+        if (inboxOpened) {
             // already open
             updateConversation(conversationId);
-            extension.windows.drawAttention(windowId);
+            extension.windows.drawAttention(inboxWindowId);
         } else if (Whisper.Notifications.isEnabled()) {
             var conversation = getConversation({id: message.get('conversationId')});
             var sender = getConversation({id: message.get('source')});
@@ -109,6 +108,7 @@
             conversation.fetchMessages();
         } else {
             openConversation(conversationId);
+            openInbox();
             extension.windows.drawAttention(windowId);
         }
     };