diff --git a/js/background.js b/js/background.js
index f370ebacc..c9bf09057 100644
--- a/js/background.js
+++ b/js/background.js
@@ -308,12 +308,7 @@
                 try {
                     if (self.inboxView) { self.inboxView.remove(); }
                     self.inboxView = new Whisper.InboxView({model: self, window: destWindow});
-                    destWindow.openConversation = function(conversation) {
-                        if (conversation) {
-                            self.inboxView.openConversation(null, conversation);
-                        }
-                    };
-                    destWindow.openConversation(getOpenConversation());
+                    self.openConversation(getOpenConversation());
 
                     return self.inboxView;
 
@@ -321,6 +316,11 @@
                     console.log(e);
                 }
             });
+        },
+        openConversation: function(conversation) {
+            if (this.inboxView && conversation) {
+                this.inboxView.openConversation(null, conversation);
+            }
         }
     };
 
diff --git a/js/panel_controller.js b/js/panel_controller.js
index d46c69fda..36c68ab0f 100644
--- a/js/panel_controller.js
+++ b/js/panel_controller.js
@@ -97,7 +97,7 @@
     var open;
     window.openConversation = function(conversation) {
         if (inboxOpened === true) {
-            appWindow.contentWindow.openConversation(conversation);
+            owsDesktopApp.openConversation(conversation);
         } else {
             open = conversation;
         }