 		return accounts.count > 1
 	}
 	
-	private var accounts: [Account]!
+	private var accounts: [Account]! {
+		didSet {
+			if let predefinedAccount = accounts.first(where: { $0.accountID == AppDefaults.addFolderAccountID }) {
+				selectedAccount = predefinedAccount
+			} else {
+				selectedAccount = accounts[0]
+			}
+		}
+	}
+
+	private var selectedAccount: Account! {
+		didSet {
+			guard selectedAccount != oldValue else { return }
+			accountLabel.text = selectedAccount.flatMap { ($0 as DisplayNameProvider).nameForDisplay }
+		}
+	}
 	
 	weak var delegate: AddContainerViewControllerChildDelegate?
 	

	}
	
	func pickerView(_ pickerView: UIPickerView, didSelectRow row: Int, inComponent component: Int) {
		accountLabel.text = (accounts[row] as DisplayNameProvider).nameForDisplay
		AppDefaults.addFolderAccountID = accounts[row].accountID
	}
	
}

		
		nameTextField.delegate = self
		
		if shouldDisplayPicker {
			accountPickerView.dataSource = self
			accountPickerView.delegate = self
			
			if let index = accounts.firstIndex(of: selectedAccount) {
				accountPickerView.selectRow(index, inComponent: 0, animated: false)
			}
			
