diff --git a/js/views/conversation_view.js b/js/views/conversation_view.js
index 42e73d2ebb..55988269ab 100644
--- a/js/views/conversation_view.js
+++ b/js/views/conversation_view.js
@@ -163,11 +163,7 @@
             this.window.addEventListener('focus', this.onFocus);
 
             extension.windows.onClosed(function () {
-                this.window.removeEventListener('resize', onResize);
-                this.window.removeEventListener('focus', onFocus);
-                window.autosize.destroy(this.$messageField);
-                this.remove();
-                this.model.messageCollection.reset([]);
+                this.unload();
             }.bind(this));
 
             this.fetchMessages();
@@ -250,6 +246,8 @@
             this.window.removeEventListener('resize', this.onResize);
             this.window.removeEventListener('focus', this.onFocus);
 
+            window.autosize.destroy(this.$messageField);
+
             this.view.remove();
 
             this.remove();