diff --git a/src/keepass2android-app/PasswordActivity.cs b/src/keepass2android-app/PasswordActivity.cs
index 96c6bd1f..3260cd30 100644
--- a/src/keepass2android-app/PasswordActivity.cs
+++ b/src/keepass2android-app/PasswordActivity.cs
@@ -1425,18 +1425,20 @@ namespace keepass2android
 			App.Kp2a.SetQuickUnlockEnabled(cbQuickUnlock.Checked);
             App.Kp2a.ScreenLockWasEnabledWhenOpeningDatabase =
                 (((KeyguardManager)GetSystemService(Context.KeyguardService)!)!).IsDeviceSecure;
+			App.Kp2a.QuickUnlockBlockedWhenDeviceNotSecureWhenOpeningDatabase = PreferenceManager.GetDefaultSharedPreferences(this)
+		        .GetBoolean(GetString(Resource.String.QuickUnlockBlockedWhenDeviceNotSecure_key), true);
 
-            if ((_loadDbFileTask != null) &&  (App.Kp2a.OfflineMode != _loadDbTaskOffline))
+            if ((_loadDbFileTask != null) && (App.Kp2a.OfflineMode != _loadDbTaskOffline))
 			{
-                if (App.Kp2a == null)
+				if (App.Kp2a == null)
 					throw new NullPointerException("App.Kp2a");
 				//keep the loading result if we loaded in online-mode (now offline) and the task is completed
 				if (!App.Kp2a.OfflineMode || !_loadDbFileTask.IsCompleted)
 				{
 					//discard the pre-loading task
-					_loadDbFileTask = null;	
+					_loadDbFileTask = null;
 				}
-				
+
 			}
 
 			//avoid password being visible while loading:
diff --git a/src/keepass2android-app/QuickUnlock.cs b/src/keepass2android-app/QuickUnlock.cs
index d57fd51f..e4141201 100644
--- a/src/keepass2android-app/QuickUnlock.cs
+++ b/src/keepass2android-app/QuickUnlock.cs
@@ -178,7 +178,7 @@ namespace keepass2android
                 App.Kp2a.Lock(false);
             };
 
-            if (App.Kp2a.ScreenLockWasEnabledWhenOpeningDatabase == false)
+            if (App.Kp2a.ScreenLockWasEnabledWhenOpeningDatabase == false && App.Kp2a.QuickUnlockBlockedWhenDeviceNotSecureWhenOpeningDatabase)
             {
 				FindViewById(Resource.Id.QuickUnlockForm).Visibility = ViewStates.Gone;
                 FindViewById(Resource.Id.QuickUnlockBlocked).Visibility = ViewStates.Visible;
diff --git a/src/keepass2android-app/Resources/layout/QuickUnlock.xml b/src/keepass2android-app/Resources/layout/QuickUnlock.xml
index 70bd4b02..e00ce971 100644
--- a/src/keepass2android-app/Resources/layout/QuickUnlock.xml
+++ b/src/keepass2android-app/Resources/layout/QuickUnlock.xml
@@ -78,11 +78,11 @@ android:paddingLeft="16dp"
 android:paddingRight="16dp"
           android:paddingTop="16dp">
 
-        
+         
         <LinearLayout
-          android:layout_width="wrap_content"
+          android:layout_width="fill_parent"
           android:layout_height="wrap_content"
-          android:orientation="horizontal"
+          android:orientation="vertical"
           android:id="@+id/QuickUnlockForm">
 
           <TextView
@@ -94,6 +94,12 @@ android:paddingRight="16dp"
             android:textSize="14sp"
           />
 
+          <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal">
+
+
           <EditText
             android:inputType="textPassword"
             android:layout_width="wrap_content"
@@ -117,8 +123,8 @@ android:paddingRight="16dp"
                                     android:src="@drawable/baseline_fingerprint_24"
                                     android:scaleType="fitXY"
                                     android:background="?android:selectableItemBackground" />
-          
-            
+
+          </LinearLayout>
 
         </LinearLayout>
 
diff --git a/src/keepass2android-app/Resources/layout/sftp_credentials.axml b/src/keepass2android-app/Resources/layout/sftp_credentials.axml
deleted file mode 100644
index f36879d2..00000000
--- a/src/keepass2android-app/Resources/layout/sftp_credentials.axml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    android:layout_margin="12dip">
-    <LinearLayout
-        android:orientation="horizontal"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content">
-        <EditText
-            android:id="@+id/sftp_host"
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:singleLine="true"
-            android:inputType="textNoSuggestions"
-            android:text="144.76.169.229"
-            android:hint="@string/hint_sftp_host" />
-        <TextView
-            android:id="@+id/portsep"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text=":" />
-        <EditText
-            android:id="@+id/sftp_port"
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:singleLine="true"
-            android:inputType="number"
-            android:text="22"
-            android:hint="@string/hint_sftp_port" />
-    </LinearLayout>
-    <EditText
-        android:id="@+id/sftp_user"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:singleLine="true"
-        android:text="philipp"
-        android:hint="@string/hint_username" />
-    <EditText
-        android:id="@+id/sftp_password"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:inputType="textPassword"
-        android:singleLine="true"
-        android:text="l2uientTjVhvyfzNpksa"
-        android:hint="@string/hint_pass" />
-    <TextView
-        android:id="@+id/initial_dir"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginLeft="4dip"
-        android:layout_marginTop="4dip"
-        android:text="@string/initial_directory" />
-    <EditText
-        android:id="@+id/sftp_initial_dir"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:singleLine="true"
-        android:text="/home/philipp" />
-</LinearLayout>
\ No newline at end of file
diff --git a/src/keepass2android-app/Resources/values/config.xml b/src/keepass2android-app/Resources/values/config.xml
index db3582ec..aa4067ba 100644
--- a/src/keepass2android-app/Resources/values/config.xml
+++ b/src/keepass2android-app/Resources/values/config.xml
@@ -123,6 +123,7 @@
 	<string name="QuickUnlockLength_default">3</string>
 	<string name="QuickUnlockIconHidden_key">QuickUnlockIconHidden_key</string>
 	<string name="QuickUnlockIconHidden16_key">QuickUnlockIconHidden16_key</string>
+	<string name="QuickUnlockBlockedWhenDeviceNotSecure_key">QuickUnlockBlockedWhenDeviceNotSecure_key</string>
 	
 	<string name="UsageCount_key">UsageCount</string>
 	<string name="LastInfoVersionCode_key">LastInfoVersion</string>
diff --git a/src/keepass2android-app/Resources/values/strings.xml b/src/keepass2android-app/Resources/values/strings.xml
index 9ee59c17..833450a5 100644
--- a/src/keepass2android-app/Resources/values/strings.xml
+++ b/src/keepass2android-app/Resources/values/strings.xml
@@ -330,6 +330,8 @@
   <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>
   <string name="QuickUnlockIconHidden16_summary">QuickUnlock requires a notification to work properly. Select this option to display a notification without an icon.</string>
+  <string name="QuickUnlockBlockedWhenDeviceNotSecure_summary">Block entering the QuickUnlock key if the device is not secured by screen lock. This prevents shoulder surfing attacks. Only disable this option if you understand the risk. Note that QuickUnlock can still be used with biometrics.</string>
+  <string name="QuickUnlockBlockedWhenDeviceNotSecure_title">Block QuickUnlock when device is not secure</string>
   <string name="QuickUnlockLength_title">Length of QuickUnlock key</string>
   <string name="QuickUnlockLength_summary">Maximum number of characters used as QuickUnlock password.</string>
   <string name="QuickUnlockHideLength_title">Hide QuickUnlock length</string>
diff --git a/src/keepass2android-app/Resources/xml/pref_app_quick_unlock.xml b/src/keepass2android-app/Resources/xml/pref_app_quick_unlock.xml
index 5c676c5f..dedab5e0 100644
--- a/src/keepass2android-app/Resources/xml/pref_app_quick_unlock.xml
+++ b/src/keepass2android-app/Resources/xml/pref_app_quick_unlock.xml
@@ -26,6 +26,14 @@
 		android:defaultValue="false"
 		android:title="@string/QuickUnlockIconHidden_title"
 		android:key="@string/QuickUnlockIconHidden_key" />
+	<CheckBoxPreference
+		android:enabled="true"
+		android:persistent="true"
+		android:summary="@string/QuickUnlockBlockedWhenDeviceNotSecure_summary"
+		android:defaultValue="true"
+		android:title="@string/QuickUnlockBlockedWhenDeviceNotSecure_title"
+		android:key="@string/QuickUnlockBlockedWhenDeviceNotSecure_key" />
+
 	<CheckBoxPreference
 		android:enabled="true"
 		android:persistent="true"
diff --git a/src/keepass2android-app/app/App.cs b/src/keepass2android-app/app/App.cs
index ea795680..cffe5fdc 100644
--- a/src/keepass2android-app/app/App.cs
+++ b/src/keepass2android-app/app/App.cs
@@ -354,6 +354,7 @@ namespace keepass2android
 		}
 
 		public bool ScreenLockWasEnabledWhenOpeningDatabase { get; set; }
+		public bool QuickUnlockBlockedWhenDeviceNotSecureWhenOpeningDatabase { get; set; }
 
 
         public bool QuickUnlockEnabled { get; private set; }