diff --git a/app/src/main/java/fr/free/nrw/commons/nearby/contract/NearbyParentFragmentContract.java b/app/src/main/java/fr/free/nrw/commons/nearby/contract/NearbyParentFragmentContract.java
index 5bf12e402..cb872d819 100644
--- a/app/src/main/java/fr/free/nrw/commons/nearby/contract/NearbyParentFragmentContract.java
+++ b/app/src/main/java/fr/free/nrw/commons/nearby/contract/NearbyParentFragmentContract.java
@@ -27,6 +27,7 @@ public interface NearbyParentFragmentContract {
         void animateFABs();
         void recenterMap(LatLng curLatLng);
         void hideBottomSheet();
+        void hideBottomDetailsSheet();
         void displayBottomSheetWithInfo(Marker marker);
         void addOnCameraMoveListener(MapboxMap.OnCameraMoveListener onCameraMoveListener);
         void addSearchThisAreaButtonAction();
@@ -51,6 +52,7 @@ public interface NearbyParentFragmentContract {
         void backButtonClicked();
         MapboxMap.OnCameraMoveListener onCameraMove(MapboxMap mapboxMap);
         void filterByMarkerType(List<Label> selectedLabels);
+        void searchViewGainedFocus();
     }
     
     interface ViewsAreReadyCallback {
diff --git a/app/src/main/java/fr/free/nrw/commons/nearby/fragments/NearbyParentFragment.java b/app/src/main/java/fr/free/nrw/commons/nearby/fragments/NearbyParentFragment.java
index 0d5b6af92..3826a620a 100644
--- a/app/src/main/java/fr/free/nrw/commons/nearby/fragments/NearbyParentFragment.java
+++ b/app/src/main/java/fr/free/nrw/commons/nearby/fragments/NearbyParentFragment.java
@@ -203,6 +203,7 @@ public class NearbyParentFragment extends CommonsDaggerSupportFragment
         searchView.setOnQueryTextFocusChangeListener((v, hasFocus) -> {
             if (hasFocus) {
                 //Log.d("deneme33","11-"+recyclerView.getAdapter().getCount());
+                nearbyParentFragmentPresenter.searchViewGainedFocus();
                 nearbyFilterList.setVisibility(View.VISIBLE);
             } else {
                // Log.d("deneme33","22-"+recyclerView.getAdapter().getCount());
@@ -789,6 +790,11 @@ public class NearbyParentFragment extends CommonsDaggerSupportFragment
         bottomSheetListBehavior.setState(BottomSheetBehavior.STATE_HIDDEN);
     }
 
+    @Override
+    public void hideBottomDetailsSheet() {
+        bottomSheetDetailsBehavior.setState(BottomSheetBehavior.STATE_HIDDEN);
+    }
+
     @Override
     public void displayBottomSheetWithInfo(Marker marker) {
         this.selectedMarker = marker;
diff --git a/app/src/main/java/fr/free/nrw/commons/nearby/presenter/NearbyParentFragmentPresenter.java b/app/src/main/java/fr/free/nrw/commons/nearby/presenter/NearbyParentFragmentPresenter.java
index 1a08c8512..1cf2b7106 100644
--- a/app/src/main/java/fr/free/nrw/commons/nearby/presenter/NearbyParentFragmentPresenter.java
+++ b/app/src/main/java/fr/free/nrw/commons/nearby/presenter/NearbyParentFragmentPresenter.java
@@ -362,6 +362,16 @@ public class NearbyParentFragmentPresenter
         //}
     }
 
+    @Override
+    public void searchViewGainedFocus() {
+        if(nearbyParentFragmentView.isListBottomSheetExpanded()) {
+            // Back should first hide the bottom sheet if it is expanded
+            nearbyParentFragmentView.hideBottomSheet();
+        } else if (nearbyParentFragmentView.isDetailsBottomSheetVisible()) {
+            nearbyParentFragmentView.hideBottomDetailsSheet();
+        }
+    }
+
     public View.OnClickListener onSearchThisAreaClicked() {
         return v -> {
             // Lock map operations during search this area operation
diff --git a/app/src/main/res/layout/fragment_nearby_parent.xml b/app/src/main/res/layout/fragment_nearby_parent.xml
index a5c452733..33384654e 100644
--- a/app/src/main/res/layout/fragment_nearby_parent.xml
+++ b/app/src/main/res/layout/fragment_nearby_parent.xml
@@ -10,6 +10,11 @@
         android:layout_height="match_parent"
         android:background="@color/status_bar_blue"
         android:id="@+id/map_layout">
+        
+        <View
+            android:layout_width="0dp"
+            android:layout_height="0dp"
+            android:focusableInTouchMode="true"/>
 
         <include
             layout="@layout/nearby_filter_all_items"