diff --git a/Session/Conversations/ConversationVC+Interaction.swift b/Session/Conversations/ConversationVC+Interaction.swift
index 36dadd958..a2e24f569 100644
--- a/Session/Conversations/ConversationVC+Interaction.swift
+++ b/Session/Conversations/ConversationVC+Interaction.swift
@@ -2183,7 +2183,15 @@ extension ConversationVC:
                             )
                         }
                     },
-                    completionHandler: { _, _ in }
+                    completionHandler: { _, _ in
+                        DispatchQueue.main.asyncAfter(deadline: .now() + .milliseconds(Int(ContextMenuVC.dismissDurationPartOne * 1000))) { [weak self] in
+                            self?.viewModel.showToast(
+                                text: "saved".localized(),
+                                backgroundColor: .toast_background,
+                                inset: Values.largeSpacing + (self?.inputAccessoryView?.frame.height ?? 0)
+                            )
+                        }
+                    }
                 )
             }
             
@@ -2193,14 +2201,6 @@ extension ConversationVC:
             }
             
             self?.sendDataExtraction(kind: .mediaSaved(timestamp: UInt64(cellViewModel.timestampMs)))
-            
-            DispatchQueue.main.asyncAfter(deadline: .now() + .milliseconds(Int(ContextMenuVC.dismissDurationPartOne * 1000))) { [weak self] in
-                self?.viewModel.showToast(
-                    text: "saved".localized(),
-                    backgroundColor: .toast_background,
-                    inset: Values.largeSpacing + (self?.inputAccessoryView?.frame.height ?? 0)
-                )
-            }
         }
         
         completion?()
diff --git a/Session/Media Viewing & Editing/MessageInfoScreen.swift b/Session/Media Viewing & Editing/MessageInfoScreen.swift
index b7f4f7618..4f9a09884 100644
--- a/Session/Media Viewing & Editing/MessageInfoScreen.swift	
+++ b/Session/Media Viewing & Editing/MessageInfoScreen.swift	
@@ -314,11 +314,11 @@ struct MessageInfoScreen: View {
                                         action: {
                                             actions[index].work() {
                                                 switch (actions[index].shouldDismissInfoScreen, actions[index].feedback) {
+                                                    case (false, _): break
                                                     case (true, .some):
                                                         DispatchQueue.main.asyncAfter(deadline: .now() + 2, execute: {
                                                             dismiss()
                                                         })
-                                                        
                                                     default: dismiss()
                                                 }
                                             }