diff --git a/submodules/Display/Source/Navigation/NavigationContainer.swift b/submodules/Display/Source/Navigation/NavigationContainer.swift
index 97c2ed8050..08d9e5a25b 100644
--- a/submodules/Display/Source/Navigation/NavigationContainer.swift
+++ b/submodules/Display/Source/Navigation/NavigationContainer.swift
@@ -116,7 +116,10 @@ public final class NavigationContainer: ASDisplayNode, UIGestureRecognizerDelega
     private var currentKeyboardLeftEdge: CGFloat = 0.0
     private var additionalKeyboardLeftEdgeOffset: CGFloat = 0.0
     
-    var statusBarStyle: StatusBarStyle = .Ignore
+    var statusBarStyle: StatusBarStyle = .Ignore {
+        didSet {
+        }
+    }
     var statusBarStyleUpdated: ((ContainedViewLayoutTransition) -> Void)?
     
     
diff --git a/submodules/Display/Source/Navigation/NavigationController.swift b/submodules/Display/Source/Navigation/NavigationController.swift
index 0204774656..da9591bf79 100644
--- a/submodules/Display/Source/Navigation/NavigationController.swift
+++ b/submodules/Display/Source/Navigation/NavigationController.swift
@@ -792,6 +792,18 @@ open class NavigationController: UINavigationController, ContainableController,
                 } else {
                     modalContainer.keyboardViewManager = nil
                     modalContainer.canHaveKeyboardFocus = false
+                    
+                    if modalContainer.isFlat {
+                        let controllerStatusBarStyle = modalContainer.container.statusBarStyle
+                        switch controllerStatusBarStyle {
+                        case .Black, .White, .Hide:
+                            if topVisibleModalContainerWithStatusBar == nil {
+                                topVisibleModalContainerWithStatusBar = modalContainer
+                            }
+                        case .Ignore:
+                            break
+                        }
+                    }
                 }
                 previousModalContainer = modalContainer
                 if isStandaloneModal {