diff --git a/js/models/conversations.d.ts b/js/models/conversations.d.ts
index e3d197a7e..95f537211 100644
--- a/js/models/conversations.d.ts
+++ b/js/models/conversations.d.ts
@@ -102,6 +102,5 @@ export interface ConversationModel
   setSecondaryStatus: any;
   queueJob: any;
   sendGroupInfo: any;
-  resetMessageSelection: any;
   onUpdateGroupName: any;
 }
diff --git a/js/models/conversations.js b/js/models/conversations.js
index bc0502e7f..a2f074409 100644
--- a/js/models/conversations.js
+++ b/js/models/conversations.js
@@ -526,7 +526,6 @@
         onCopyPublicKey: () => this.copyPublicKey(),
         onDeleteContact: () => this.deleteContact(),
         onDeleteMessages: () => this.deleteMessages(),
-        onCloseOverlay: () => this.resetMessageSelection(),
         onInviteContacts: () => {
           window.Whisper.events.trigger('inviteContacts', this);
         },
diff --git a/js/views/conversation_view.js b/js/views/conversation_view.js
index da8f829c8..eb28a54f0 100644
--- a/js/views/conversation_view.js
+++ b/js/views/conversation_view.js
@@ -533,7 +533,6 @@
       this.lastActivity = Date.now();
 
       this.model.updateLastMessage();
-      this.model.resetMessageSelection();
 
       if (this.model.isRss()) {
         $('.compose').hide();
diff --git a/stylesheets/_session.scss b/stylesheets/_session.scss
index af18550d2..3e57d9c49 100644
--- a/stylesheets/_session.scss
+++ b/stylesheets/_session.scss
@@ -469,7 +469,6 @@ label {
   cursor: pointer;
 }
 
-
 .Toastify__toast {
   @include themify($themes) {
     background: rgba(themed('cellBackground'), 0.99);
diff --git a/ts/components/session/SessionToastContainer.tsx b/ts/components/session/SessionToastContainer.tsx
index d41976fb0..0c76fd64b 100644
--- a/ts/components/session/SessionToastContainer.tsx
+++ b/ts/components/session/SessionToastContainer.tsx
@@ -11,7 +11,7 @@ const SessionToastContainerPrivate = () => {
       newestOnTop={true}
       closeOnClick={true}
       rtl={false}
-      pauseOnFocusLoss={true}
+      pauseOnFocusLoss={false}
       draggable={true}
       pauseOnHover={true}
       transition={Slide}
diff --git a/ts/components/session/conversation/SessionConversation.tsx b/ts/components/session/conversation/SessionConversation.tsx
index 8f3909abd..0d3c163ee 100644
--- a/ts/components/session/conversation/SessionConversation.tsx
+++ b/ts/components/session/conversation/SessionConversation.tsx
@@ -449,7 +449,6 @@ export class SessionConversation extends React.Component<Props, State> {
       onDeleteSelectedMessages: this.deleteSelectedMessages,
       onCloseOverlay: () => {
         this.setState({ selectedMessages: [] });
-        conversation.resetMessageSelection();
       },
       onDeleteContact: () => conversation.deleteContact(),
       onResetSession: () => {
diff --git a/ts/session/utils/Toast.tsx b/ts/session/utils/Toast.tsx
index 2ed0c8ff3..aaac6bc72 100644
--- a/ts/session/utils/Toast.tsx
+++ b/ts/session/utils/Toast.tsx
@@ -60,8 +60,7 @@ export function pushToastSuccess(
       description={description}
       type={SessionToastType.Success}
       icon={icon}
-    />,
-    { toastId: id }
+    />
   );
 }