diff --git a/CHANGELOG b/CHANGELOG
index 38a433317..5d95bcb85 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+KeePassDX(3.5.0)
+ * Keep screen on by default when viewing an entry
+
 KeePassDX(3.4.4)
  * Fix crash in New Android 13 #1321
  * Better backstack management for selection mode
diff --git a/app/build.gradle b/app/build.gradle
index 5f826fa04..a3a69b7fe 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -12,8 +12,8 @@ android {
         applicationId "com.kunzisoft.keepass"
         minSdkVersion 15
         targetSdkVersion 31
-        versionCode = 113
-        versionName = "3.4.4"
+        versionCode = 114
+        versionName = "3.5.0"
         multiDexEnabled true
 
         testApplicationId = "com.kunzisoft.keepass.tests"
diff --git a/app/src/main/java/com/kunzisoft/keepass/activities/EntryEditActivity.kt b/app/src/main/java/com/kunzisoft/keepass/activities/EntryEditActivity.kt
index 2d3af56a5..89e0252f5 100644
--- a/app/src/main/java/com/kunzisoft/keepass/activities/EntryEditActivity.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/activities/EntryEditActivity.kt
@@ -479,6 +479,11 @@ class EntryEditActivity : DatabaseLockActivity(),
                 }
             }
         }
+
+        // Keep the screen on
+        if (PreferencesUtil.isKeepScreenOnEnabled(this)) {
+            window.addFlags(android.view.WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON)
+        }
     }
 
     override fun onPause() {
diff --git a/fastlane/metadata/android/en-US/changelogs/114.txt b/fastlane/metadata/android/en-US/changelogs/114.txt
new file mode 100644
index 000000000..2ba386422
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/114.txt
@@ -0,0 +1 @@
+ * Keep screen on by default when viewing an entry
diff --git a/fastlane/metadata/android/fr-FR/changelogs/114.txt b/fastlane/metadata/android/fr-FR/changelogs/114.txt
new file mode 100644
index 000000000..f46526cec
--- /dev/null
+++ b/fastlane/metadata/android/fr-FR/changelogs/114.txt
@@ -0,0 +1 @@
+ * Garder l'écran allumé par défaut lors d'une visualisation d'entrée