diff --git a/pass/Controllers/PasswordNavigationViewController.swift b/pass/Controllers/PasswordNavigationViewController.swift
index 1d0119f..e7353a6 100644
--- a/pass/Controllers/PasswordNavigationViewController.swift
+++ b/pass/Controllers/PasswordNavigationViewController.swift
@@ -76,7 +76,7 @@ class PasswordNavigationViewController: UIViewController {
     }
 
     private func configureSearchBar() {
-        if Defaults.isShowFolderOn, !isRootViewController() {
+        if Defaults.isShowFolderOn {
             searchBar.scopeButtonTitles = SearchBarScope.allCases.map(\.localizedName)
         } else {
             searchBar.scopeButtonTitles = nil
@@ -84,16 +84,25 @@ class PasswordNavigationViewController: UIViewController {
     }
 
     private func configureTableView(in dir: PasswordEntity?) {
-        let passwordTableEntries = fetchPasswordTableEntries(in: dir)
-        dataSource = PasswordNavigationDataSource(entries: passwordTableEntries)
+        configureTableViewDataSource(in: dir, isShowFolder: Defaults.isShowFolderOn)
         tableView.addGestureRecognizer(gestureRecognizer)
-        tableView.dataSource = dataSource
         tableView.delegate = self
         let atribbutedTitle = "LastSynced".localize() + ": \(PasswordStore.shared.lastSyncedTimeString)"
         refreshControl.attributedTitle = NSAttributedString(string: atribbutedTitle)
         tableView.refreshControl = refreshControl
     }
 
+    private func configureTableViewDataSource(in dir: PasswordEntity?, isShowFolder: Bool) {
+        var passwordTableEntries: [PasswordTableEntry]
+        if isShowFolder {
+            passwordTableEntries = PasswordStore.shared.fetchPasswordEntityCoreData(parent: dir).compactMap { PasswordTableEntry($0) }
+        } else {
+            passwordTableEntries = PasswordStore.shared.fetchPasswordEntityCoreData(withDir: false).compactMap { PasswordTableEntry($0) }
+        }
+        dataSource = PasswordNavigationDataSource(entries: passwordTableEntries)
+        tableView.dataSource = dataSource
+    }
+
     private func configureTabBarItem() {
         guard let tabBarItem = navigationController?.tabBarItem else {
             return
@@ -107,14 +116,6 @@ class PasswordNavigationViewController: UIViewController {
         }
     }
 
-    private func fetchPasswordTableEntries(in dir: PasswordEntity? = nil) -> [PasswordTableEntry] {
-        if Defaults.isShowFolderOn {
-            return PasswordStore.shared.fetchPasswordEntityCoreData(parent: dir).compactMap { PasswordTableEntry($0) }
-        } else {
-            return PasswordStore.shared.fetchPasswordEntityCoreData(withDir: false).compactMap { PasswordTableEntry($0) }
-        }
-    }
-
     private func configureNavigationItem() {
         if isRootViewController() {
             navigationItem.largeTitleDisplayMode = .automatic
@@ -321,6 +322,7 @@ extension PasswordNavigationViewController {
         configureNavigationItem()
         configureTabBarItem()
         configureNavigationBar()
+        configureSearchBar()
     }
 }
 
@@ -332,9 +334,9 @@ extension PasswordNavigationViewController: UISearchBarDelegate {
 
     func activateSearch(_ selectedScope: Int?) {
         if selectedScope == SearchBarScope.all.rawValue {
-            configureTableView(in: nil)
+            configureTableViewDataSource(in: nil, isShowFolder: false)
         } else {
-            configureTableView(in: parentPasswordEntity)
+            configureTableViewDataSource(in: parentPasswordEntity, isShowFolder: true)
         }
         dataSource?.isSearchActive = true
         tableView.reloadData()
@@ -345,7 +347,7 @@ extension PasswordNavigationViewController: UISearchBarDelegate {
     }
 
     func searchBarTextDidBeginEditing(_ searchBar: UISearchBar) {
-        if Defaults.isShowFolderOn, Defaults.searchDefault == .all {
+        if Defaults.searchDefault == .all {
             searchBar.selectedScopeButtonIndex = SearchBarScope.all.rawValue
         } else {
             searchBar.selectedScopeButtonIndex = SearchBarScope.current.rawValue
diff --git a/passKit/Models/PasswordEntity.swift b/passKit/Models/PasswordEntity.swift
index dba561b..f1e3a60 100644
--- a/passKit/Models/PasswordEntity.swift
+++ b/passKit/Models/PasswordEntity.swift
@@ -11,8 +11,12 @@ import SwiftyUserDefaults
 
 public extension PasswordEntity {
     var nameWithCategory: String {
-        if let path = path, path.hasSuffix(".gpg") {
-            return String(path.prefix(upTo: path.index(path.endIndex, offsetBy: -4)))
+        if let path = path {
+            if path.hasSuffix(".gpg") {
+                return String(path.prefix(upTo: path.index(path.endIndex, offsetBy: -4)))
+            } else {
+                return path
+            }
         }
         return ""
     }