diff --git a/src/keepass2android/EntryEditActivity.cs b/src/keepass2android/EntryEditActivity.cs
index 663aef82..07ef93e8 100644
--- a/src/keepass2android/EntryEditActivity.cs
+++ b/src/keepass2android/EntryEditActivity.cs
@@ -279,7 +279,17 @@ namespace keepass2android
 
 		}
 
-		private void CreateNewFromKpEntryTemplate(Database db, PwEntry templateEntry)
+	    protected override void OnStart()
+	    {
+	        base.OnStart();
+	        if (PreferenceManager.GetDefaultSharedPreferences(this)
+	            .GetBoolean(GetString(Resource.String.UseKp2aKeyboardInKp2a_key), false))
+	        {
+	            CopyToClipboardService.ActivateKeyboard(this);
+	        }
+        }
+
+	    private void CreateNewFromKpEntryTemplate(Database db, PwEntry templateEntry)
 		{
 			var entry = new PwEntry(true, true);
 			KpEntryTemplatedEdit.InitializeEntry(entry, templateEntry);
diff --git a/src/keepass2android/PasswordActivity.cs b/src/keepass2android/PasswordActivity.cs
index 73286ddb..4164e96f 100644
--- a/src/keepass2android/PasswordActivity.cs
+++ b/src/keepass2android/PasswordActivity.cs
@@ -1625,7 +1625,13 @@ namespace keepass2android
 			base.OnStart();
 			_starting = true;
 
-		    AppTask.CanActivateSearchViewOnStart = true;
+		    if (PreferenceManager.GetDefaultSharedPreferences(this)
+		        .GetBoolean(GetString(Resource.String.UseKp2aKeyboardInKp2a_key), false))
+		    {
+		        CopyToClipboardService.ActivateKeyboard(this);
+		    }
+
+                AppTask.CanActivateSearchViewOnStart = true;
             DonateReminder.ShowDonateReminderIfAppropriate(this);
 			
 			
diff --git a/src/keepass2android/Resources/values/config.xml b/src/keepass2android/Resources/values/config.xml
index 6e333614..f515f35b 100644
--- a/src/keepass2android/Resources/values/config.xml
+++ b/src/keepass2android/Resources/values/config.xml
@@ -114,8 +114,10 @@
 	<string name="UseFileTransactions_key">UseFileTransactions</string>
 	<string name="LockWhenScreenOff_key">LockWhenScreenOff</string>
 	<string name="LockWhenNavigateBack_key">kp2a_switch_rootedLockWhenNavigateBack</string>
+  <string name="UseKp2aKeyboardInKp2a_key">UseKp2aKeyboardInKp2a</string>
+  
 
-	<string name="NoDonateOption_key">NoDonateOption</string>
+  <string name="NoDonateOption_key">NoDonateOption</string>
   <string name="NoDonationReminder_key">NoDonationReminder</string>
 
 	<string name="UseOfflineCache_key">UseOfflineCache</string>
diff --git a/src/keepass2android/Resources/values/strings.xml b/src/keepass2android/Resources/values/strings.xml
index eb7fba27..27111637 100644
--- a/src/keepass2android/Resources/values/strings.xml
+++ b/src/keepass2android/Resources/values/strings.xml
@@ -346,6 +346,11 @@
 	<string name="LockWhenNavigateBack_title">Lock when leaving app</string>
 	<string name="LockWhenNavigateBack_summary">Lock the database when leaving the app by pressing the back button.</string>
 
+  <string name="UseKp2aKeyboardInKp2a_title">Use built-in keyboard inside Keepass2Android</string>
+  <string name="UseKp2aKeyboardInKp2a_summary">If you do not trust your standard keyboard provider, check this option to use the built-in keyboard when entering your master password or editing entries.</string>
+
+  
+
   <string name="ActivateSearchViewOnStart_title">Activate search field on start</string>
   <string name="ActivateSearchViewOnStart_summary">Activates search field in the group view after unlocking or when searching for an entry</string>
 
diff --git a/src/keepass2android/Resources/xml/preferences.xml b/src/keepass2android/Resources/xml/preferences.xml
index 91dd9d9e..21bbcf4c 100644
--- a/src/keepass2android/Resources/xml/preferences.xml
+++ b/src/keepass2android/Resources/xml/preferences.xml
@@ -200,6 +200,14 @@
 				 android:title="@string/ClearPasswordOnLeave_title"
 				 android:key="@string/ClearPasswordOnLeave_key" />
 
+		  <CheckBoxPreference
+		    android:enabled="true"
+		    android:persistent="true"
+		    android:summary="@string/UseKp2aKeyboardInKp2a_summary"
+		    android:defaultValue="false"
+		    android:title="@string/UseKp2aKeyboardInKp2a_title"
+		    android:key="@string/UseKp2aKeyboardInKp2a_key" />
+
 
 		</PreferenceScreen>
 		<PreferenceScreen