diff --git a/js/views/bulk_edit_view.js b/js/views/bulk_edit_view.js
index c886ff023..ec6b37301 100644
--- a/js/views/bulk_edit_view.js
+++ b/js/views/bulk_edit_view.js
@@ -8,33 +8,29 @@
 
   Whisper.BulkEditView = Whisper.View.extend({
     initialize(options) {
-      this.selectedMessages = new Set();
-      this.render();
-      this.onCancel = options.onCancel;
-      this.onDelete = options.onDelete;
+      this.memberView = null;
+      this.props = {
+        onCancel: options.onCancel,
+        onDelete: options.onDelete,
+        messageCount: 0,
+      };
     },
     render() {
       if (this.memberView) {
-        this.memberView.remove();
-        this.memberView = null;
+        this.memberView.update(this.props);
+        return;
       }
-
       this.memberView = new Whisper.ReactWrapperView({
         className: 'bulk-edit-view',
         Component: window.Signal.Components.BulkEdit,
-        props: {
-          messageCount: this.selectedMessages.size,
-          onCancel: this.onCancel,
-          onDelete: this.onDelete,
-        },
+        props: this.props,
       });
 
       this.$el.append(this.memberView.el);
-      return this;
     },
 
-    update(selectedMessages) {
-      this.selectedMessages = selectedMessages;
+    update(selectionSize) {
+      this.props.messageCount = selectionSize;
       this.render();
     },
   });
diff --git a/js/views/conversation_view.js b/js/views/conversation_view.js
index 2e4d13f5a..053badfea 100644
--- a/js/views/conversation_view.js
+++ b/js/views/conversation_view.js
@@ -1802,7 +1802,7 @@
         $('.compose').show();
       }
 
-      this.bulkEditView.update(this.model.selectedMessages);
+      this.bulkEditView.update(selectionSize);
     },
 
     resetMessageSelection() {