diff --git a/submodules/ChatListUI/Sources/ChatListSearchListPaneNode.swift b/submodules/ChatListUI/Sources/ChatListSearchListPaneNode.swift
index 533b8013f6..7d12d87d6b 100644
--- a/submodules/ChatListUI/Sources/ChatListSearchListPaneNode.swift
+++ b/submodules/ChatListUI/Sources/ChatListSearchListPaneNode.swift
@@ -4403,14 +4403,24 @@ final class ChatListSearchListPaneNode: ASDisplayNode, ChatListSearchPaneNode {
     func scrollToTop() -> Bool {
         if !self.mediaNode.isHidden {
             return self.mediaNode.scrollToTop()
-        }
-        let offset = self.listNode.visibleContentOffset()
-        switch offset {
-        case let .known(value) where value <= CGFloat.ulpOfOne:
-            return false
-        default:
-            self.listNode.transaction(deleteIndices: [], insertIndicesAndItems: [], updateIndicesAndItems: [], options: [.Synchronous, .LowLatency], scrollToItem: ListViewScrollToItem(index: 0, position: .top(0.0), animated: true, curve: .Default(duration: nil), directionHint: .Up), updateSizeAndInsets: nil, stationaryItemRange: nil, updateOpaqueState: nil, completion: { _ in })
-            return true
+        } else if !self.recentListNode.isHidden {
+            let offset = self.recentListNode.visibleContentOffset()
+            switch offset {
+            case let .known(value) where value <= CGFloat.ulpOfOne:
+                return false
+            default:
+                self.recentListNode.transaction(deleteIndices: [], insertIndicesAndItems: [], updateIndicesAndItems: [], options: [.Synchronous, .LowLatency], scrollToItem: ListViewScrollToItem(index: 0, position: .top(0.0), animated: true, curve: .Default(duration: nil), directionHint: .Up), updateSizeAndInsets: nil, stationaryItemRange: nil, updateOpaqueState: nil, completion: { _ in })
+                return true
+            }
+        } else {
+            let offset = self.listNode.visibleContentOffset()
+            switch offset {
+            case let .known(value) where value <= CGFloat.ulpOfOne:
+                return false
+            default:
+                self.listNode.transaction(deleteIndices: [], insertIndicesAndItems: [], updateIndicesAndItems: [], options: [.Synchronous, .LowLatency], scrollToItem: ListViewScrollToItem(index: 0, position: .top(0.0), animated: true, curve: .Default(duration: nil), directionHint: .Up), updateSizeAndInsets: nil, stationaryItemRange: nil, updateOpaqueState: nil, completion: { _ in })
+                return true
+            }
         }
     }
     
diff --git a/submodules/TelegramUI/Components/PeerSelectionController/Sources/PeerSelectionControllerNode.swift b/submodules/TelegramUI/Components/PeerSelectionController/Sources/PeerSelectionControllerNode.swift
index 6f189e3089..e04ae5ff85 100644
--- a/submodules/TelegramUI/Components/PeerSelectionController/Sources/PeerSelectionControllerNode.swift
+++ b/submodules/TelegramUI/Components/PeerSelectionController/Sources/PeerSelectionControllerNode.swift
@@ -1274,6 +1274,9 @@ final class PeerSelectionControllerNode: ASDisplayNode {
                         if updated {
                             strongSelf.textInputPanelNode?.updateSendButtonEnabled(count > 0, animated: true)
                             strongSelf.requestDeactivateSearch?()
+                            if let (layout, navigationBarHeight, actualNavigationBarHeight) = strongSelf.containerLayout {
+                                strongSelf.containerLayoutUpdated(layout, navigationBarHeight: navigationBarHeight, actualNavigationBarHeight: actualNavigationBarHeight, transition: .immediate)
+                            }
                         } else if let requestOpenPeerFromSearch = strongSelf.requestOpenPeerFromSearch {
                             requestOpenPeerFromSearch(peer, threadId)
                         }
diff --git a/submodules/WebUI/Sources/WebAppMessagePreviewScreen.swift b/submodules/WebUI/Sources/WebAppMessagePreviewScreen.swift
index 5769326ba9..da8e19073d 100644
--- a/submodules/WebUI/Sources/WebAppMessagePreviewScreen.swift
+++ b/submodules/WebUI/Sources/WebAppMessagePreviewScreen.swift
@@ -324,7 +324,8 @@ private final class WebAppMessagePreviewSheetComponent: CombinedComponent {
                         preparedMessage: context.component.preparedMessage,
                         dismiss: {
                             animateOut.invoke(Action { _ in
-                                if let controller = controller() {
+                                if let controller = controller() as? WebAppMessagePreviewScreen {
+                                    controller.completeWithResult(false)
                                     controller.dismiss(completion: nil)
                                 }
                             })