diff --git a/pass/Controllers/PasswordNavigationViewController.swift b/pass/Controllers/PasswordNavigationViewController.swift
index 642425d..60dc7d4 100644
--- a/pass/Controllers/PasswordNavigationViewController.swift
+++ b/pass/Controllers/PasswordNavigationViewController.swift
@@ -74,6 +74,7 @@ class PasswordNavigationViewController: UIViewController {
         configureTableView(in: parentPasswordEntity)
         configureNotification()
         configureSearchBar()
+        configureNavigationBar()
         requestNotificationPermission()
     }
 
@@ -206,7 +207,7 @@ class PasswordNavigationViewController: UIViewController {
     func didTapNavigationBar(_ sender: UITapGestureRecognizer) {
         let location = sender.location(in: navigationController?.navigationBar)
         let hitView = navigationController?.navigationBar.hitTest(location, with: nil)
-        guard !(hitView is UIControl) else {
+        guard String(describing: hitView).contains("UINavigationBarContentView") else {
             return
         }