diff --git a/CHANGELOG b/CHANGELOG
index ef4735239..b2bb084fa 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -7,7 +7,7 @@ KeePassDX(4.1.0)
  * Resets the advanced unlock expiration #1600
  * Password entropy #1490 #1355
  * Upgrade to API 34 (Android 14) #1730
- * Small fixes #1711 #1831 #1780 #1821 #1863 #1889 #1289 #1600 #1467
+ * Small fixes #1711 #1831 #1780 #1821 #1863 #1889 #1289 #1600 #1467 #1870
 
 KeePassDX(4.0.8)
  * Fix graphical bug that prevented databases from being opened on some versions of Android #1848 #1850
diff --git a/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/DatabaseDialogFragment.kt b/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/DatabaseDialogFragment.kt
index 3c83c7750..a8d53f9ee 100644
--- a/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/DatabaseDialogFragment.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/DatabaseDialogFragment.kt
@@ -1,11 +1,14 @@
 package com.kunzisoft.keepass.activities.dialogs
 
 import android.os.Bundle
+import android.view.View
+import android.view.WindowManager.LayoutParams.FLAG_SECURE
 import androidx.fragment.app.DialogFragment
 import androidx.fragment.app.activityViewModels
 import com.kunzisoft.keepass.activities.legacy.DatabaseRetrieval
 import com.kunzisoft.keepass.activities.legacy.resetAppTimeoutWhenViewTouchedOrFocused
 import com.kunzisoft.keepass.database.ContextualDatabase
+import com.kunzisoft.keepass.settings.PreferencesUtil
 import com.kunzisoft.keepass.tasks.ActionRunnable
 import com.kunzisoft.keepass.timeout.TimeoutHelper
 import com.kunzisoft.keepass.viewmodels.DatabaseViewModel
@@ -29,6 +32,18 @@ abstract class DatabaseDialogFragment : DialogFragment(), DatabaseRetrieval {
         }
     }
 
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        // Screenshot mode or hide views
+        context?.let {
+            if (PreferencesUtil.isScreenshotModeEnabled(it)) {
+                dialog?.window?.clearFlags(FLAG_SECURE)
+            } else {
+                dialog?.window?.setFlags(FLAG_SECURE, FLAG_SECURE)
+            }
+        }
+    }
+
     @Suppress("DEPRECATION")
     override fun onActivityCreated(savedInstanceState: Bundle?) {
         super.onActivityCreated(savedInstanceState)
diff --git a/fastlane/metadata/android/en-US/changelogs/132.txt b/fastlane/metadata/android/en-US/changelogs/132.txt
index 4fea8522e..f72b36d9a 100644
--- a/fastlane/metadata/android/en-US/changelogs/132.txt
+++ b/fastlane/metadata/android/en-US/changelogs/132.txt
@@ -6,4 +6,4 @@
  * Resets the advanced unlock expiration #1600
  * Password entropy #1490 #1355
  * Upgrade to API 34 (Android 14) #1730
- * Small fixes #1711 #1831 #1780 #1821 #1863 #1889 #1289 #1600 #1467
\ No newline at end of file
+ * Small fixes #1711 #1831 #1780 #1821 #1863 #1889 #1289 #1600 #1467 #1870
\ No newline at end of file
diff --git a/fastlane/metadata/android/fr-FR/changelogs/132.txt b/fastlane/metadata/android/fr-FR/changelogs/132.txt
index 1c1b7354a..c24a71a6d 100644
--- a/fastlane/metadata/android/fr-FR/changelogs/132.txt
+++ b/fastlane/metadata/android/fr-FR/changelogs/132.txt
@@ -5,4 +5,4 @@
  * Correction des noms de domaines #1105 #1820
  * Entropie de mot de passe #1490 #1355
  * Mise à jour vers API 34 (Android 14)
- * Petites corrections #1711 #1831 #1780 #1821 #1863 #1889 #1289 #1600 #1467
\ No newline at end of file
+ * Petites corrections #1711 #1831 #1780 #1821 #1863 #1889 #1289 #1600 #1467 #1870
\ No newline at end of file