diff --git a/Display/AlertControllerNode.swift b/Display/AlertControllerNode.swift
index eb9ebf16e5..30ae994d00 100644
--- a/Display/AlertControllerNode.swift
+++ b/Display/AlertControllerNode.swift
@@ -29,19 +29,15 @@ final class AlertControllerNode: ASDisplayNode {
         
         self.topDimView = UIView()
         self.topDimView.backgroundColor = dimColor
-        self.topDimView.isUserInteractionEnabled = false
         
         self.bottomDimView = UIView()
         self.bottomDimView.backgroundColor = dimColor
-        self.bottomDimView.isUserInteractionEnabled = false
         
         self.leftDimView = UIView()
         self.leftDimView.backgroundColor = dimColor
-        self.leftDimView.isUserInteractionEnabled = false
         
         self.rightDimView = UIView()
         self.rightDimView.backgroundColor = dimColor
-        self.rightDimView.isUserInteractionEnabled = false
         
         self.containerNode = ASDisplayNode()
         self.containerNode.layer.cornerRadius = 14.0
@@ -81,13 +77,15 @@ final class AlertControllerNode: ASDisplayNode {
         
         self.topDimView.addGestureRecognizer(UITapGestureRecognizer(target: self, action: #selector(self.dimmingNodeTapGesture(_:))))
         self.bottomDimView.addGestureRecognizer(UITapGestureRecognizer(target: self, action: #selector(self.dimmingNodeTapGesture(_:))))
+        self.leftDimView.addGestureRecognizer(UITapGestureRecognizer(target: self, action: #selector(self.dimmingNodeTapGesture(_:))))
+        self.rightDimView.addGestureRecognizer(UITapGestureRecognizer(target: self, action: #selector(self.dimmingNodeTapGesture(_:))))
     }
     
     func updateTheme(_ theme: AlertControllerTheme) {
         if let effectView = self.effectNode.view as? UIVisualEffectView {
             effectView.effect = UIBlurEffect(style: theme.backgroundType == .light ? .light : .dark)
         }
-        self.containerNode.backgroundColor = theme.backgroundColor
+        self.backgroundNode.backgroundColor = theme.backgroundColor
         self.contentNode.updateTheme(theme)
     }
     
diff --git a/Display/NavigationController.swift b/Display/NavigationController.swift
index 5477849529..e0e2965134 100644
--- a/Display/NavigationController.swift
+++ b/Display/NavigationController.swift
@@ -818,10 +818,12 @@ open class NavigationController: UINavigationController, ContainableController,
                                 controller.containerLayoutUpdated(containerLayout, transition: .immediate)
                             }
                             strongSelf.pushViewController(controller, animated: animated)
+                            completion()
                         }
                     }))
                 } else {
                     strongSelf.pushViewController(controller, animated: false)
+                    completion()
                 }
             })
         }