diff --git a/‎submodules/TelegramUI/Components/PeerInfo/PeerInfoScreen/Sources/PeerInfoScreenSettingsActions.swift‎
Lines changed: 3 additions & 3 deletions b/‎submodules/TelegramUI/Components/PeerInfo/PeerInfoScreen/Sources/PeerInfoScreenSettingsActions.swift‎
Lines changed: 3 additions & 3 deletions
@@ -25,7 +25,7 @@ extension PeerInfoScreenNode {
                 return
             }
 
-            if strongSelf.isMyProfile {
+            if strongSelf.isMyProfile || strongSelf.isSettings { // MARK: Swiftgram
                 navigationController.pushViewController(c)
             } else {
                 var updatedControllers = navigationController.viewControllers
@@ -85,7 +85,7 @@ extension PeerInfoScreenNode {
                     return
                 }
                 if let controller = self.controller, let navigationController = controller.navigationController as? NavigationController {
-                    self.context.sharedContext.navigateToChatController(NavigateToChatControllerParams(navigationController: navigationController, context: self.context, chatLocation: .peer(peer)))
+                    self.context.sharedContext.navigateToChatController(NavigateToChatControllerParams(navigationController: navigationController, context: self.context, chatLocation: .peer(peer), keepStack: .always)) // MARK: Swiftgram
                 }
             })
         case .recentCalls:
@@ -386,7 +386,7 @@ extension PeerInfoScreenNode {
         |> deliverOnMainQueue).startStrict(next: { [weak controller] peer in
             controller?.dismiss()
             if let peer = peer, let navigationController = navigationController {
-                context.sharedContext.navigateToChatController(NavigateToChatControllerParams(navigationController: navigationController, context: context, chatLocation: .peer(peer)))
+                context.sharedContext.navigateToChatController(NavigateToChatControllerParams(navigationController: navigationController, context: context, chatLocation: .peer(peer), keepStack: .always)) // MARK: Swiftgram
             }
         }))
     }
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ extension PeerInfoScreenNode {`
`25`	`25`	`return`
`26`	`26`	`}`
`27`	`27`
`28`		`- if strongSelf.isMyProfile {`
	`28`	`+ if strongSelf.isMyProfile \|\| strongSelf.isSettings { // MARK: Swiftgram`
`29`	`29`	`navigationController.pushViewController(c)`
`30`	`30`	`} else {`
`31`	`31`	`var updatedControllers = navigationController.viewControllers`
`@@ -85,7 +85,7 @@ extension PeerInfoScreenNode {`
`85`	`85`	`return`
`86`	`86`	`}`
`87`	`87`	`if let controller = self.controller, let navigationController = controller.navigationController as? NavigationController {`
`88`		`- self.context.sharedContext.navigateToChatController(NavigateToChatControllerParams(navigationController: navigationController, context: self.context, chatLocation: .peer(peer)))`
	`88`	`+ self.context.sharedContext.navigateToChatController(NavigateToChatControllerParams(navigationController: navigationController, context: self.context, chatLocation: .peer(peer), keepStack: .always)) // MARK: Swiftgram`
`89`	`89`	`}`
`90`	`90`	`})`
`91`	`91`	`case .recentCalls:`
`@@ -386,7 +386,7 @@ extension PeerInfoScreenNode {`
`386`	`386`	`\|> deliverOnMainQueue).startStrict(next: { [weak controller] peer in`
`387`	`387`	`controller?.dismiss()`
`388`	`388`	`if let peer = peer, let navigationController = navigationController {`
`389`		`- context.sharedContext.navigateToChatController(NavigateToChatControllerParams(navigationController: navigationController, context: context, chatLocation: .peer(peer)))`
	`389`	`+ context.sharedContext.navigateToChatController(NavigateToChatControllerParams(navigationController: navigationController, context: context, chatLocation: .peer(peer), keepStack: .always)) // MARK: Swiftgram`
`390`	`390`	`}`
`391`	`391`	`}))`
`392`	`392`	`}`