diff --git a/pass/Controllers/AddPasswordTableViewController.swift b/pass/Controllers/AddPasswordTableViewController.swift
index cc82e85..c536f80 100644
--- a/pass/Controllers/AddPasswordTableViewController.swift
+++ b/pass/Controllers/AddPasswordTableViewController.swift
@@ -10,8 +10,8 @@ import UIKit
 import passKit
 
 class AddPasswordTableViewController: PasswordEditorTableViewController {
-    var tempContent: String = ""
     let passwordStore = PasswordStore.shared
+    var defaultDirPrefix = ""
 
     override func viewDidLoad() {
         tableData = [
@@ -24,6 +24,7 @@ class AddPasswordTableViewController: PasswordEditorTableViewController {
             lengthSetting.max > lengthSetting.min {
             tableData[1].append([.type: PasswordEditorCellType.passwordLengthCell, .title: "passwordlength"])
         }
+        tableData[0][0][PasswordEditorCellKey.content] = defaultDirPrefix
         super.viewDidLoad()
     }
     
diff --git a/pass/Controllers/PasswordsViewController.swift b/pass/Controllers/PasswordsViewController.swift
index be79dba..55380f3 100644
--- a/pass/Controllers/PasswordsViewController.swift
+++ b/pass/Controllers/PasswordsViewController.swift
@@ -466,6 +466,14 @@ class PasswordsViewController: UIViewController, UITableViewDataSource, UITableV
                 let passwordEntity = getPasswordEntry(by: selectedIndexPath).passwordEntity!
                 viewController.passwordEntity = passwordEntity
             }
+        } else if segue.identifier == "addPasswordSegue" {
+            if let navController = segue.destination as? UINavigationController {
+                if let viewController = navController.topViewController as? AddPasswordTableViewController {
+                    if let path = parentPasswordEntity?.path {
+                        viewController.defaultDirPrefix = "\(path)/"
+                    }
+                }
+            }
         }
     }