diff --git a/src/keepass2android/PasswordActivity.cs b/src/keepass2android/PasswordActivity.cs
index d5fe2ea2..360dc6b8 100644
--- a/src/keepass2android/PasswordActivity.cs
+++ b/src/keepass2android/PasswordActivity.cs
@@ -86,8 +86,10 @@ namespace keepass2android
 
 	    public const String KeyKeyfile = "keyFile";
 	    public const String KeyPassword = "password";
+        public const String LaunchImmediately = "launchImmediately";
 
-		private const string ShowpasswordKey = "ShowPassword";
+
+        private const string ShowpasswordKey = "ShowPassword";
 		private const string KeyProviderIdOtp = "KP2A-OTP";
 		private const string KeyProviderIdOtpRecovery = "KP2A-OTPSecret";
 		private const string KeyProviderIdChallenge = "KP2A-Chal";
diff --git a/src/keepass2android/SelectCurrentDbActivity.cs b/src/keepass2android/SelectCurrentDbActivity.cs
index 451501d5..1dc70c26 100644
--- a/src/keepass2android/SelectCurrentDbActivity.cs
+++ b/src/keepass2android/SelectCurrentDbActivity.cs
@@ -232,8 +232,9 @@ namespace keepass2android
                     //forward to password activity
                     Intent i = new Intent(this, typeof(PasswordActivity));
                     Util.PutIoConnectionToIntent(ioc, i);
-                    i.PutExtra(PasswordActivity.KeyKeyfile, i.GetStringExtra(PasswordActivity.KeyKeyfile));
-                    i.PutExtra(PasswordActivity.KeyPassword, i.GetStringExtra(PasswordActivity.KeyPassword));
+                    i.PutExtra(PasswordActivity.KeyKeyfile, Intent.GetStringExtra(PasswordActivity.KeyKeyfile));
+                    i.PutExtra(PasswordActivity.KeyPassword, Intent.GetStringExtra(PasswordActivity.KeyPassword));
+                    i.PutExtra(PasswordActivity.LaunchImmediately, Intent.GetBooleanExtra(PasswordActivity.LaunchImmediately, false));
                     LaunchingOther = true;
                     StartActivityForResult(i, ReqCodeOpenNewDb);
                 }