diff --git a/CHANGELOG b/CHANGELOG
index 494ec9cea..4c78f04bd 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -5,7 +5,7 @@ KeePassDX(3.0.0)
  * Fix timeout in dialogs #716
  * Check URI permissions #626
  * Better autofill implementation #943 #946 #984 #1070 (Thx @uduerholz)
- * Improvements #680 #1035 #1043 #942 #1021 #1027 #1082
+ * Improvements #680 #1035 #1043 #942 #1021 #1027 #1082 #1083 (Thx @chenxiaolong)
 
 KeePassDX(2.10.5)
  * Increase the saving speed of database #1028
diff --git a/app/src/main/java/com/kunzisoft/keepass/magikeyboard/MagikeyboardService.kt b/app/src/main/java/com/kunzisoft/keepass/magikeyboard/MagikeyboardService.kt
index 0712d6622..afe86591a 100644
--- a/app/src/main/java/com/kunzisoft/keepass/magikeyboard/MagikeyboardService.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/magikeyboard/MagikeyboardService.kt
@@ -179,9 +179,8 @@ class MagikeyboardService : InputMethodService(), KeyboardView.OnKeyboardActionL
     }
 
     override fun onEvaluateFullscreenMode(): Boolean {
-        val fullscreenAllowed = resources.getBoolean(R.bool.magikeyboard_allow_fullscreen_mode)
-
-        return fullscreenAllowed && super.onEvaluateFullscreenMode()
+        return resources.getBoolean(R.bool.magikeyboard_allow_fullscreen_mode)
+                && super.onEvaluateFullscreenMode()
     }
 
     private fun playVibration(keyCode: Int) {
diff --git a/app/src/main/res/values-sw600dp/config.xml b/app/src/main/res/values-sw600dp/config.xml
deleted file mode 100644
index 6ad4af76e..000000000
--- a/app/src/main/res/values-sw600dp/config.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- Copyright 2021 Jeremy Jamet / Kunzisoft.
-
- This file is part of KeePassDX.
-
-  KeePassDX is free software: you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation, either version 3 of the License, or
-  (at your option) any later version.
-
-  KeePassDX is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with KeePassDX.  If not, see <http://www.gnu.org/licenses/>.
--->
-<resources>
-    <bool name="magikeyboard_allow_fullscreen_mode">false</bool>
-</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-sw768dp/config.xml b/app/src/main/res/values-sw768dp/config.xml
deleted file mode 100644
index 6ad4af76e..000000000
--- a/app/src/main/res/values-sw768dp/config.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- Copyright 2021 Jeremy Jamet / Kunzisoft.
-
- This file is part of KeePassDX.
-
-  KeePassDX is free software: you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation, either version 3 of the License, or
-  (at your option) any later version.
-
-  KeePassDX is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with KeePassDX.  If not, see <http://www.gnu.org/licenses/>.
--->
-<resources>
-    <bool name="magikeyboard_allow_fullscreen_mode">false</bool>
-</resources>
\ No newline at end of file
diff --git a/fastlane/metadata/android/en-US/changelogs/84.txt b/fastlane/metadata/android/en-US/changelogs/84.txt
index 1f491bec0..453904c27 100644
--- a/fastlane/metadata/android/en-US/changelogs/84.txt
+++ b/fastlane/metadata/android/en-US/changelogs/84.txt
@@ -4,4 +4,4 @@
  * Fix timeout in dialogs #716
  * Check URI permissions #626
  * Better autofill implementation #943 #946 #984 #1070 (Thx @uduerholz)
- * Improvements #680 #1035 #1043 #942 #1021 #1027 #1082
\ No newline at end of file
+ * Improvements #680 #1035 #1043 #942 #1021 #1027 #1082 #1083 (Thx @chenxiaolong)
\ No newline at end of file
diff --git a/fastlane/metadata/android/fr-FR/changelogs/84.txt b/fastlane/metadata/android/fr-FR/changelogs/84.txt
index 44fff36c3..80c558317 100644
--- a/fastlane/metadata/android/fr-FR/changelogs/84.txt
+++ b/fastlane/metadata/android/fr-FR/changelogs/84.txt
@@ -4,4 +4,4 @@
  * Correction du délai d'expiration dans les dialogues #716
  * Vérification des permissions URI #626
  * Meilleure implémentation du remplissage auto #943 #946 #984 #1070 (Thx @uduerholz)
- * Améliorations #680 #1035 #1043 #942 #1021 #1027 #1082
\ No newline at end of file
+ * Améliorations #680 #1035 #1043 #942 #1021 #1027 #1082 #1083 (Thx @chenxiaolong)
\ No newline at end of file