diff --git a/submodules/Display/Display/Navigation/NavigationController.swift b/submodules/Display/Display/Navigation/NavigationController.swift
index 4bcd356147..21aa9d51ad 100644
--- a/submodules/Display/Display/Navigation/NavigationController.swift
+++ b/submodules/Display/Display/Navigation/NavigationController.swift
@@ -45,24 +45,6 @@ public enum NavigationEmptyDetailsBackgoundMode {
     case wallpaper(UIImage)
 }
 
-private final class NavigationControllerView: UITracingLayerView {
-    override init(frame: CGRect) {
-        super.init(frame: frame)
-    }
-    
-    required init?(coder aDecoder: NSCoder) {
-        fatalError("init(coder:) has not been implemented")
-    }
-    
-    override class var layerClass: AnyClass {
-        return CATracingLayer.self
-    }
-    
-    override func hitTest(_ point: CGPoint, with event: UIEvent?) -> UIView? {
-        return super.hitTest(point, with: event)
-    }
-}
-
 private enum ControllerTransition {
     case none
     case appearance
@@ -105,6 +87,24 @@ private final class GlobalOverlayContainerParent: ASDisplayNode {
     }
 }
 
+private final class NavigationControllerNode: ASDisplayNode {
+    private weak var controller: NavigationController?
+    
+    init(controller: NavigationController) {
+        self.controller = controller
+        
+        super.init()
+    }
+    
+    override func hitTest(_ point: CGPoint, with event: UIEvent?) -> UIView? {
+        if let controller = self.controller, controller.isInteractionDisabled() {
+            return self.view
+        } else {
+            return super.hitTest(point, with: event)
+        }
+    }
+}
+
 open class NavigationController: UINavigationController, ContainableController, UIGestureRecognizerDelegate {
     public var isOpaqueWhenInOverlay: Bool = true
     public var blocksBackgroundWhenInOverlay: Bool = true
@@ -130,10 +130,6 @@ open class NavigationController: UINavigationController, ContainableController,
     
     public private(set) weak var overlayPresentingController: ViewController?
     
-    private var controllerView: NavigationControllerView {
-        return self.view as! NavigationControllerView
-    }
-    
     var inCallNavigate: (() -> Void)?
     private var inCallStatusBar: StatusBar?
     private var globalScrollToTopNode: ScrollToTopNode?
@@ -269,6 +265,15 @@ open class NavigationController: UINavigationController, ContainableController,
         return supportedOrientations
     }
     
+    fileprivate func isInteractionDisabled() -> Bool {
+        for overlayContainer in self.overlayContainers {
+            if overlayContainer.blocksInteractionUntilReady && !overlayContainer.isReady {
+                return true
+            }
+        }
+        return false
+    }
+    
     public func updateTheme(_ theme: NavigationControllerTheme) {
         let statusBarStyleUpdated = self.theme.statusBar != theme.statusBar
         self.theme = theme
@@ -281,7 +286,7 @@ open class NavigationController: UINavigationController, ContainableController,
             }
         }
         if self.isViewLoaded {
-            self.controllerView.backgroundColor = theme.emptyAreaColor
+            self.displayNode.backgroundColor = theme.emptyAreaColor
             if let layout = self.validLayout {
                 self.containerLayoutUpdated(layout, transition: .immediate)
             }
@@ -940,15 +945,13 @@ open class NavigationController: UINavigationController, ContainableController,
     }
     
     open override func loadView() {
-        self._displayNode = ASDisplayNode(viewBlock: {
-            return NavigationControllerView()
-        }, didLoad: nil)
+        self._displayNode = NavigationControllerNode(controller: self)
         
         self.view = self.displayNode.view
         self.view.clipsToBounds = true
         self.view.autoresizingMask = []
         
-        self.controllerView.backgroundColor = self.theme.emptyAreaColor
+        self.displayNode.backgroundColor = self.theme.emptyAreaColor
         
         if #available(iOSApplicationExtension 11.0, iOS 11.0, *) {
             self.navigationBar.prefersLargeTitles = false
@@ -1102,8 +1105,8 @@ open class NavigationController: UINavigationController, ContainableController,
         }
     }
     
-    public func presentOverlay(controller: ViewController, inGlobal: Bool = false) {
-        let container = NavigationOverlayContainer(controller: controller, controllerRemoved: { [weak self] controller in
+    public func presentOverlay(controller: ViewController, inGlobal: Bool = false, blockInteraction: Bool = false) {
+        let container = NavigationOverlayContainer(controller: controller, blocksInteractionUntilReady: blockInteraction, controllerRemoved: { [weak self] controller in
             guard let strongSelf = self else {
                 return
             }
diff --git a/submodules/Display/Display/Navigation/NavigationOverlayContainer.swift b/submodules/Display/Display/Navigation/NavigationOverlayContainer.swift
index 20c2a5cae0..d1524321c8 100644
--- a/submodules/Display/Display/Navigation/NavigationOverlayContainer.swift
+++ b/submodules/Display/Display/Navigation/NavigationOverlayContainer.swift
@@ -5,6 +5,7 @@ import SwiftSignalKit
 
 final class NavigationOverlayContainer: ASDisplayNode {
     let controller: ViewController
+    let blocksInteractionUntilReady: Bool
     
     private(set) var isReady: Bool = false
     var isReadyUpdated: (() -> Void)?
@@ -21,8 +22,9 @@ final class NavigationOverlayContainer: ASDisplayNode {
         }
     }
     
-    init(controller: ViewController, controllerRemoved: @escaping (ViewController) -> Void, statusBarUpdated: @escaping (ContainedViewLayoutTransition) -> Void) {
+    init(controller: ViewController, blocksInteractionUntilReady: Bool, controllerRemoved: @escaping (ViewController) -> Void, statusBarUpdated: @escaping (ContainedViewLayoutTransition) -> Void) {
         self.controller = controller
+        self.blocksInteractionUntilReady = blocksInteractionUntilReady
         
         super.init()
         
diff --git a/submodules/Display/Display/WindowContent.swift b/submodules/Display/Display/WindowContent.swift
index 6daff3f21e..67e9280d67 100644
--- a/submodules/Display/Display/WindowContent.swift
+++ b/submodules/Display/Display/WindowContent.swift
@@ -1100,13 +1100,13 @@ public class Window1 {
         if level.rawValue <= 3, let controller = controller as? ViewController {
             for presentedController in self.presentationContext.controllers.reversed() {
                 if let navigationController = presentedController.0 as? NavigationController {
-                    navigationController.presentOverlay(controller: controller, inGlobal: false)
+                    navigationController.presentOverlay(controller: controller, inGlobal: false, blockInteraction: blockInteraction)
                     return
                 }
             }
             
             if let navigationController = self._rootController as? NavigationController {
-                navigationController.presentOverlay(controller: controller, inGlobal: false)
+                navigationController.presentOverlay(controller: controller, inGlobal: false, blockInteraction: blockInteraction)
             } else {
                 self.presentationContext.present(controller, on: level, blockInteraction: blockInteraction, completion: completion)
             }