diff --git a/Telegram-iOS/ApplicationContext.swift b/Telegram-iOS/ApplicationContext.swift
index 7bcdf5fbb4..5c7c2cdfe1 100644
--- a/Telegram-iOS/ApplicationContext.swift
+++ b/Telegram-iOS/ApplicationContext.swift
@@ -210,8 +210,12 @@ final class AuthorizedApplicationContext {
                     if updatedState.isActive {
                         if strongSelf.passcodeController == nil {
                             let presentAnimated = previousState != nil && previousState!.isActive
-                            let controller = PasscodeEntryController(context: strongSelf.context, challengeData: updatedState.challengeData, enableBiometrics: updatedState.enableBiometrics, arguments: PasscodeEntryControllerPresentationArguments(animated: presentAnimated, lockIconInitialFrame: {
-                                return CGRect()
+                            let controller = PasscodeEntryController(context: strongSelf.context, challengeData: updatedState.challengeData, enableBiometrics: updatedState.enableBiometrics, arguments: PasscodeEntryControllerPresentationArguments(animated: presentAnimated, lockIconInitialFrame: { [weak self] in
+                                if let strongSelf = self, let lockViewFrame = strongSelf.rootController.chatListController?.lockViewFrame {
+                                    return lockViewFrame
+                                } else {
+                                    return CGRect()
+                                }
                             }))
                             strongSelf.passcodeController = controller
                             
diff --git a/Telegram-iOS/en.lproj/Localizable.strings b/Telegram-iOS/en.lproj/Localizable.strings
index 2c9fc50064..b9bdd6d027 100644
--- a/Telegram-iOS/en.lproj/Localizable.strings
+++ b/Telegram-iOS/en.lproj/Localizable.strings
@@ -4236,6 +4236,8 @@ Unused sets are archived when you add more.";
 
 "ChatList.UndoArchiveTitle" = "Chat Archived";
 "ChatList.UndoArchiveText" = "Muted chats will stay archived after new messages arrive.";
+"ChatList.UndoArchiveHiddenTitle" = "Archive Hidden";
+"ChatList.UndoArchiveHiddenText" = "Swipe down to see archive.";
 "ChatList.ArchivedChatsTitle" = "Archived Chats";
 
 "PasscodeSettings.PasscodeOptions" = "Passcode Options";