KeyFive
diff --git a/‎submodules/TelegramUI/Sources/ChatController.swift‎
Lines changed: 13 additions & 2 deletions b/‎submodules/TelegramUI/Sources/ChatController.swift‎
Lines changed: 13 additions & 2 deletions
@@ -6560,19 +6560,31 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
 
         let psaEntities: [MessageTextEntity] = generateTextEntities(psaText, enabledTypes: .url)
 
+        let messageId = item.message.id
+        
         var found = false
         self.forEachController({ controller in
             if let controller = controller as? TooltipScreen {
                 if controller.text == psaText {
                     found = true
                     controller.resetDismissTimeout()
+                    
+                    controller.willBecomeDismissed = { [weak self] tooltipScreen in
+                        guard let strongSelf = self else {
+                            return
+                        }
+                        if strongSelf.controllerInteraction?.currentPsaMessageWithTooltip == messageId {
+                            strongSelf.controllerInteraction?.currentPsaMessageWithTooltip = nil
+                            strongSelf.updatePollTooltipMessageState(animated: true)
+                        }
+                    }
+                    
                     return false
                 }
             }
             return true
         })
         if found {
-            let messageId = item.message.id
             self.controllerInteraction?.currentPsaMessageWithTooltip = messageId
             self.updatePollTooltipMessageState(animated: !isAutomatic)
 
@@ -6624,7 +6636,6 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
             }
         })
 
-        let messageId = item.message.id
         self.controllerInteraction?.currentPsaMessageWithTooltip = messageId
         self.updatePollTooltipMessageState(animated: !isAutomatic)