diff --git a/submodules/Display/Source/NavigationBar.swift b/submodules/Display/Source/NavigationBar.swift
index 44e59fa632..8a916d1b0c 100644
--- a/submodules/Display/Source/NavigationBar.swift
+++ b/submodules/Display/Source/NavigationBar.swift
@@ -921,7 +921,12 @@ open class NavigationBar: ASDisplayNode {
         }
     }
     
+    public var isBackgroundVisible: Bool {
+        return self.backgroundNode.alpha == 1.0
+    }
+    
     public func updateBackgroundAlpha(_ alpha: CGFloat, transition: ContainedViewLayoutTransition) {
+        let alpha = max(0.0, min(1.0, alpha))
         transition.updateAlpha(node: self.backgroundNode, alpha: alpha, delay: 0.15)
         transition.updateAlpha(node: self.stripeNode, alpha: alpha, delay: 0.15)
     }
diff --git a/submodules/Display/Source/NavigationTransitionCoordinator.swift b/submodules/Display/Source/NavigationTransitionCoordinator.swift
index 692f8fa287..b133473604 100644
--- a/submodules/Display/Source/NavigationTransitionCoordinator.swift
+++ b/submodules/Display/Source/NavigationTransitionCoordinator.swift
@@ -125,7 +125,11 @@ final class NavigationTransitionCoordinator {
         
         var dimInset: CGFloat = 0.0
         if let bottomNavigationBar = self.bottomNavigationBar , self.inlineNavigationBarTransition {
-            dimInset = bottomNavigationBar.frame.maxY
+            if self.bottomNavigationBar?.isBackgroundVisible == false || self.topNavigationBar?.isBackgroundVisible == false {
+                
+            } else {
+                dimInset = bottomNavigationBar.frame.maxY
+            }
         }
         
         let containerSize = self.container.bounds.size
diff --git a/submodules/ItemListUI/Sources/Items/ItemListSwitchItem.swift b/submodules/ItemListUI/Sources/Items/ItemListSwitchItem.swift
index a46b433791..c236527181 100644
--- a/submodules/ItemListUI/Sources/Items/ItemListSwitchItem.swift
+++ b/submodules/ItemListUI/Sources/Items/ItemListSwitchItem.swift
@@ -139,6 +139,7 @@ public class ItemListSwitchItemNode: ListViewItemNode, ItemListItemNode {
         self.backgroundNode.backgroundColor = .white
         
         self.maskNode = ASImageNode()
+        self.maskNode.isUserInteractionEnabled = false
         
         self.topStripeNode = ASDisplayNode()
         self.topStripeNode.isLayerBacked = true