diff --git a/FlowCrypt/src/main/res/values/themes.xml b/FlowCrypt/src/main/res/values/themes.xml
index 157fc925fe..a92bc151d7 100644
--- a/FlowCrypt/src/main/res/values/themes.xml
+++ b/FlowCrypt/src/main/res/values/themes.xml
@@ -3,10 +3,15 @@
   ~ Contributors: denbond7
   -->
 
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools">
     <!-- Base application theme. -->
     <style name="AppTheme" parent="Theme.Material3.DayNight">
 
+        <!-- A temporary solution to fix edge-to-edge issue, should be finally fixed by
+         https://github.com/FlowCrypt/flowcrypt-android/issues/2958
+         -->
+        <item name="android:windowOptOutEdgeToEdgeEnforcement" tools:targetApi="35">true</item>
+
         <!-- Customize your theme here. -->
         <item name="colorPrimary">@color/colorPrimary</item>
         <item name="colorPrimaryDark">@color/colorPrimaryDark</item>