diff --git a/ts/components/Inbox.tsx b/ts/components/Inbox.tsx
index cac22b2251..effc600b46 100644
--- a/ts/components/Inbox.tsx
+++ b/ts/components/Inbox.tsx
@@ -95,9 +95,6 @@ export function Inbox({
     ) {
       conversation.trigger('scroll-to-message', selectedMessage);
     }
-
-    // Make sure poppers are positioned properly
-    window.dispatchEvent(new Event('resize'));
   }, [
     prevConversation,
     selectedConversationId,
diff --git a/ts/views/conversation_view.tsx b/ts/views/conversation_view.tsx
index 6135d7812b..ea582e25d2 100644
--- a/ts/views/conversation_view.tsx
+++ b/ts/views/conversation_view.tsx
@@ -2193,11 +2193,6 @@ export class ConversationView extends window.Backbone.View<ConversationModel> {
         timeout = undefined;
 
         panel.view.remove();
-
-        if (this.panels.length === 0) {
-          // Make sure poppers are positioned properly
-          window.dispatchEvent(new Event('resize'));
-        }
       };
       panel.view.$el
         .addClass('panel--remove')