diff --git a/android/app/src/main/java/app/organicmaps/base/BaseMwmDialogFragment.java b/android/app/src/main/java/app/organicmaps/base/BaseMwmDialogFragment.java
index 8559b0ac6..0f0a7d76f 100644
--- a/android/app/src/main/java/app/organicmaps/base/BaseMwmDialogFragment.java
+++ b/android/app/src/main/java/app/organicmaps/base/BaseMwmDialogFragment.java
@@ -7,15 +7,9 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.StyleRes;
 import androidx.fragment.app.DialogFragment;
-import app.organicmaps.R;
 
 public class BaseMwmDialogFragment extends DialogFragment
 {
-  @StyleRes
-  protected final int getFullscreenTheme()
-  {
-    return R.style.MwmTheme_DialogFragment_Fullscreen;
-  }
 
   protected int getStyle()
   {
diff --git a/android/app/src/main/java/app/organicmaps/widget/placepage/EditBookmarkFragment.java b/android/app/src/main/java/app/organicmaps/widget/placepage/EditBookmarkFragment.java
index f8bb3302e..0a7a4a9a7 100644
--- a/android/app/src/main/java/app/organicmaps/widget/placepage/EditBookmarkFragment.java
+++ b/android/app/src/main/java/app/organicmaps/widget/placepage/EditBookmarkFragment.java
@@ -1,5 +1,6 @@
 package app.organicmaps.widget.placepage;
 
+import android.app.Dialog;
 import android.content.Context;
 import android.graphics.drawable.Drawable;
 import android.os.Bundle;
@@ -14,6 +15,7 @@ import androidx.annotation.Nullable;
 import androidx.core.view.ViewCompat;
 import androidx.core.view.WindowCompat;
 import androidx.core.view.WindowInsetsCompat;
+import androidx.fragment.app.DialogFragment;
 import androidx.fragment.app.FragmentFactory;
 import androidx.fragment.app.FragmentManager;
 import app.organicmaps.R;
@@ -103,9 +105,9 @@ public class EditBookmarkFragment extends BaseMwmDialogFragment implements View.
   public EditBookmarkFragment() {}
 
   @Override
-  protected int getCustomTheme()
-  {
-    return getFullscreenTheme();
+  public void onCreate(@Nullable Bundle savedInstanceState) {
+    super.onCreate(savedInstanceState);
+    setStyle(DialogFragment.STYLE_NORMAL, R.style.MwmTheme_FullScreenDialog);
   }
 
   @Nullable
@@ -181,6 +183,12 @@ public class EditBookmarkFragment extends BaseMwmDialogFragment implements View.
   public void onStart()
   {
     super.onStart();
+    Dialog dialog = getDialog();
+    if (dialog != null) {
+      dialog.getWindow().setLayout(
+              ViewGroup.LayoutParams.MATCH_PARENT,
+              ViewGroup.LayoutParams.MATCH_PARENT);
+    }
 
     // Focus name and show keyboard for "Unknown Place" bookmarks
     if (mBookmark != null
diff --git a/android/app/src/main/res/values/themes.xml b/android/app/src/main/res/values/themes.xml
index c2b18be90..361c35e2e 100644
--- a/android/app/src/main/res/values/themes.xml
+++ b/android/app/src/main/res/values/themes.xml
@@ -210,6 +210,11 @@
     <item name="android:navigationBarColor">@android:color/transparent</item>
   </style>
 
+  <style name="MwmTheme.FullScreenDialog">
+    <item name="android:windowIsFloating">false</item>
+    <item name="android:windowBackground">@android:color/white</item>
+  </style>
+
   <style name="MwmMain.MaterialTimePicker" parent="ThemeOverlay.MaterialComponents.TimePicker">
     <item name="colorAccent">@color/base_accent</item>
     <item name="colorSecondary">@color/base_accent</item>