diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index c3abab0f4..1ff93e999 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -377,6 +377,7 @@
 
     <activity
         android:name="app.organicmaps.downloader.DownloaderActivity"
+        android:enableOnBackInvokedCallback="true"
         android:configChanges="orientation|screenLayout|screenSize"
         android:screenOrientation="fullUser"
         android:label="@string/download_maps"
diff --git a/android/app/src/main/java/app/organicmaps/downloader/DownloaderActivity.java b/android/app/src/main/java/app/organicmaps/downloader/DownloaderActivity.java
index 58bb0594c..710f66660 100644
--- a/android/app/src/main/java/app/organicmaps/downloader/DownloaderActivity.java
+++ b/android/app/src/main/java/app/organicmaps/downloader/DownloaderActivity.java
@@ -2,7 +2,6 @@ package app.organicmaps.downloader;
 
 import androidx.fragment.app.Fragment;
 import app.organicmaps.base.BaseMwmFragmentActivity;
-import app.organicmaps.base.OnBackPressListener;
 
 public class DownloaderActivity extends BaseMwmFragmentActivity
 {
@@ -13,13 +12,4 @@ public class DownloaderActivity extends BaseMwmFragmentActivity
   {
     return DownloaderFragment.class;
   }
-
-  @Override
-  public void onBackPressed()
-  {
-    OnBackPressListener fragment =
-        (OnBackPressListener) getSupportFragmentManager().findFragmentById(getFragmentContentResId());
-    if (!fragment.onBackPressed())
-      super.onBackPressed();
-  }
 }
diff --git a/android/app/src/main/java/app/organicmaps/downloader/DownloaderAdapter.java b/android/app/src/main/java/app/organicmaps/downloader/DownloaderAdapter.java
index ddd636009..56060f667 100644
--- a/android/app/src/main/java/app/organicmaps/downloader/DownloaderAdapter.java
+++ b/android/app/src/main/java/app/organicmaps/downloader/DownloaderAdapter.java
@@ -11,6 +11,7 @@ import android.text.style.StyleSpan;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import androidx.activity.OnBackPressedCallback;
 import androidx.annotation.LayoutRes;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
@@ -63,6 +64,15 @@ class DownloaderAdapter extends RecyclerView.Adapter<DownloaderAdapter.ViewHolde
   private int mListenerSlot;
   private CountryItem mSelectedItem;
 
+  private final OnBackPressedCallback mBackPressedCallback = new OnBackPressedCallback(false) {
+    @Override
+    public void handleOnBackPressed()
+    {
+      goUpwards();
+      setEnabled(canGoUpwards());
+    }
+  };
+
   private static class GenericItem
   {
     @Nullable
@@ -693,6 +703,7 @@ class DownloaderAdapter extends RecyclerView.Adapter<DownloaderAdapter.ViewHolde
 
     lm.scrollToPosition(0);
 
+    mBackPressedCallback.setEnabled(true);
     if (!refresh)
       return;
 
@@ -724,6 +735,12 @@ class DownloaderAdapter extends RecyclerView.Adapter<DownloaderAdapter.ViewHolde
     return true;
   }
 
+  @NonNull
+  OnBackPressedCallback getBackPressedCallback()
+  {
+    return mBackPressedCallback;
+  }
+
   void setAvailableMapsMode()
   {
     goDeeper(getCurrentRootItem(), false);
diff --git a/android/app/src/main/java/app/organicmaps/downloader/DownloaderFragment.java b/android/app/src/main/java/app/organicmaps/downloader/DownloaderFragment.java
index 07754a95b..688d0ada6 100644
--- a/android/app/src/main/java/app/organicmaps/downloader/DownloaderFragment.java
+++ b/android/app/src/main/java/app/organicmaps/downloader/DownloaderFragment.java
@@ -14,7 +14,6 @@ import androidx.core.view.ViewCompat;
 import androidx.recyclerview.widget.RecyclerView;
 import app.organicmaps.R;
 import app.organicmaps.base.BaseMwmRecyclerFragment;
-import app.organicmaps.base.OnBackPressListener;
 import app.organicmaps.sdk.downloader.CountryItem;
 import app.organicmaps.sdk.downloader.MapManager;
 import app.organicmaps.sdk.search.MapSearchListener;
@@ -26,7 +25,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 public class DownloaderFragment extends BaseMwmRecyclerFragment<DownloaderAdapter>
-    implements OnBackPressListener, MenuBottomSheetFragment.MenuBottomSheetInterface
+    implements MenuBottomSheetFragment.MenuBottomSheetInterface
 {
   private DownloaderToolbarController mToolbarController;
 
@@ -154,6 +153,7 @@ public class DownloaderFragment extends BaseMwmRecyclerFragment<DownloaderAdapte
 
     mBottomPanel = new BottomPanel(this, view);
     mToolbarController = new DownloaderToolbarController(view, requireActivity(), this);
+    requireActivity().getOnBackPressedDispatcher().addCallback(getViewLifecycleOwner(), mToolbarController.getBackPressedCallback());
 
     update();
   }
@@ -183,18 +183,6 @@ public class DownloaderFragment extends BaseMwmRecyclerFragment<DownloaderAdapte
       getRecyclerView().removeOnScrollListener(mScrollListener);
   }
 
-  @Override
-  public boolean onBackPressed()
-  {
-    if (mToolbarController.hasQuery())
-    {
-      mToolbarController.clear();
-      return true;
-    }
-
-    return mAdapter != null && mAdapter.goUpwards();
-  }
-
   @Override
   protected int getLayoutRes()
   {
@@ -207,6 +195,7 @@ public class DownloaderFragment extends BaseMwmRecyclerFragment<DownloaderAdapte
   {
     if (mAdapter == null)
       mAdapter = new DownloaderAdapter(this);
+    requireActivity().getOnBackPressedDispatcher().addCallback(getViewLifecycleOwner(), mAdapter.getBackPressedCallback());
 
     return mAdapter;
   }
diff --git a/android/app/src/main/java/app/organicmaps/widget/SearchToolbarController.java b/android/app/src/main/java/app/organicmaps/widget/SearchToolbarController.java
index 5de9e85e0..12e17bc92 100644
--- a/android/app/src/main/java/app/organicmaps/widget/SearchToolbarController.java
+++ b/android/app/src/main/java/app/organicmaps/widget/SearchToolbarController.java
@@ -9,6 +9,7 @@ import android.text.TextWatcher;
 import android.view.KeyEvent;
 import android.view.View;
 import android.view.inputmethod.EditorInfo;
+import androidx.activity.OnBackPressedCallback;
 import androidx.activity.result.ActivityResult;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
@@ -42,11 +43,22 @@ public class SearchToolbarController extends ToolbarController implements View.O
     @Override
     public void onTextChanged(CharSequence s, int start, int before, int count)
     {
-      updateViewsVisibility(TextUtils.isEmpty(s));
+      final boolean isEmpty = TextUtils.isEmpty(s);
+      mBackPressedCallback.setEnabled(!isEmpty);
+      updateViewsVisibility(isEmpty);
       SearchToolbarController.this.onTextChanged(s.toString());
     }
   };
 
+  private final OnBackPressedCallback mBackPressedCallback = new OnBackPressedCallback(false) {
+    @Override
+    public void handleOnBackPressed()
+    {
+      clear();
+      setEnabled(false);
+    }
+  };
+
   public SearchToolbarController(@NonNull View root, @NonNull Activity activity)
   {
     super(root, activity);
@@ -226,4 +238,9 @@ public class SearchToolbarController extends ToolbarController implements View.O
   {
     mQuery.setHint(hint);
   }
+
+  @NonNull
+  public OnBackPressedCallback getBackPressedCallback() {
+    return mBackPressedCallback;
+  }
 }