diff --git a/src/keepass2android/LockCloseActivity.cs b/src/keepass2android/LockCloseActivity.cs
index e716e472..245502be 100644
--- a/src/keepass2android/LockCloseActivity.cs
+++ b/src/keepass2android/LockCloseActivity.cs
@@ -18,7 +18,9 @@ This file is part of Keepass2Android, Copyright 2013 Philipp Crocoll. This file
 using System;
 using Android.Content;
 using Android.OS;
+using Android.Preferences;
 using Android.Runtime;
+using Android.Views;
 using KeePassLib.Serialization;
 
 namespace keepass2android
@@ -52,6 +54,14 @@ namespace keepass2android
 		{
 			base.OnCreate(savedInstanceState);
 			_design.ApplyTheme();
+
+			if (PreferenceManager.GetDefaultSharedPreferences(this).GetBoolean(
+				GetString(Resource.String.ViewDatabaseSecure_key), true))
+			{
+				Window.SetFlags(WindowManagerFlags.Secure, WindowManagerFlags.Secure);	
+			}
+			
+
 			_ioc = App.Kp2a.GetDb().Ioc;
 
 			if (Intent.GetBooleanExtra(NoLockCheck, false))
diff --git a/src/keepass2android/LockCloseListActivity.cs b/src/keepass2android/LockCloseListActivity.cs
index a1496a05..8390e5e8 100644
--- a/src/keepass2android/LockCloseListActivity.cs
+++ b/src/keepass2android/LockCloseListActivity.cs
@@ -20,6 +20,7 @@ using Android.Content;
 using Android.OS;
 using Android.Preferences;
 using Android.Runtime;
+using Android.Views;
 using KeePassLib.Serialization;
 
 namespace keepass2android
@@ -42,6 +43,13 @@ namespace keepass2android
 		{
 			base.OnCreate(savedInstanceState);
 			_design.ApplyTheme();
+
+			if (PreferenceManager.GetDefaultSharedPreferences(this).GetBoolean(
+				GetString(Resource.String.ViewDatabaseSecure_key), true))
+			{
+				Window.SetFlags(WindowManagerFlags.Secure, WindowManagerFlags.Secure);
+			}
+
 			_ioc = App.Kp2a.GetDb().Ioc;
 
 			_intentReceiver = new LockCloseListActivityBroadcastReceiver(this);
diff --git a/src/keepass2android/Resources/values/config.xml b/src/keepass2android/Resources/values/config.xml
index 0d6a22dd..d7e5f0ca 100644
--- a/src/keepass2android/Resources/values/config.xml
+++ b/src/keepass2android/Resources/values/config.xml
@@ -72,7 +72,7 @@
     <bool name="TanExpiresOnUse_default">true</bool>
     <bool name="ShowUsernameInList_default">true</bool>
     <bool name="ShowGroupnameInSearchResult_default">true</bool>
-
+	<string name="ViewDatabaseSecure_key">ViewDatabaseSecure</string>
 	<bool name="RememberRecentFiles_default">true</bool>
 	<string name="TrayTotp_SettingsField_key">TrayTotp_SettingsField_key</string>
 	<string name="TrayTotp_SeedField_key">TrayTotp_SeedField_key</string>
diff --git a/src/keepass2android/Resources/values/strings.xml b/src/keepass2android/Resources/values/strings.xml
index 5b3f891e..1de6fcf2 100644
--- a/src/keepass2android/Resources/values/strings.xml
+++ b/src/keepass2android/Resources/values/strings.xml
@@ -229,6 +229,8 @@
   <string name="QuickUnlock_lockButton">Close database</string>
   <string name="QuickUnlockDefaultEnabled_title">Enable QuickUnlock by default</string>
   <string name="QuickUnlockDefaultEnabled_summary">Defines whether QuickUnlock is enabled by default or not.</string>
+	<string name="ViewDatabaseSecure_title">Protect database display</string>
+	<string name="ViewDatabaseSecure_summary">Protect database display</string>
   <string name="QuickUnlockIconHidden_title">Hide QuickUnlock icon</string>
   <string name="QuickUnlockIconHidden_summary">QuickUnlock unfortunately does not work without displaying a notification icon. Select this option to use a transparent icon.</string>
   <string name="QuickUnlockIconHidden16_title">Hide QuickUnlock icon</string>
diff --git a/src/keepass2android/Resources/xml/preferences.xml b/src/keepass2android/Resources/xml/preferences.xml
index 5e7dec2e..72315b03 100644
--- a/src/keepass2android/Resources/xml/preferences.xml
+++ b/src/keepass2android/Resources/xml/preferences.xml
@@ -160,6 +160,15 @@
 			  android:dialogTitle="@string/list_size_summary"
 			  android:defaultValue="@string/list_size_default"/>
 
+			<CheckBoxPreference
+				android:enabled="true"
+					 android:persistent="true"
+					 android:summary="@string/ViewDatabaseSecure_summary"
+					 android:defaultValue="true"
+					 android:title="@string/ViewDatabaseSecure_title"
+					 android:key="@string/ViewDatabaseSecure_key" />
+
+
 			<ListPreference
 			  android:key="@string/design_key"
 			  android:title="@string/design_title"