diff --git a/app/src/main/java/fr/free/nrw/commons/nearby/NearbyActivity.java b/app/src/main/java/fr/free/nrw/commons/nearby/NearbyActivity.java
index ec410ca69..9e0ce1c13 100644
--- a/app/src/main/java/fr/free/nrw/commons/nearby/NearbyActivity.java
+++ b/app/src/main/java/fr/free/nrw/commons/nearby/NearbyActivity.java
@@ -55,9 +55,12 @@ public class NearbyActivity extends BaseActivity {
     }
 
     private void showMapView() {
-        isMapViewActive = true;
-        getSupportFragmentManager().beginTransaction()
-                .replace(R.id.container, new NearbyMapFragment()).commit();
+        if(!isMapViewActive){
+            getSupportFragmentManager().beginTransaction()
+                    .replace(R.id.container, new NearbyMapFragment()).commit();
+            isMapViewActive = true;
+        }
+
     }
 
     @Override
diff --git a/app/src/main/java/fr/free/nrw/commons/nearby/NearbyMapFragment.java b/app/src/main/java/fr/free/nrw/commons/nearby/NearbyMapFragment.java
index 664b48aa2..d590ed3a2 100644
--- a/app/src/main/java/fr/free/nrw/commons/nearby/NearbyMapFragment.java
+++ b/app/src/main/java/fr/free/nrw/commons/nearby/NearbyMapFragment.java
@@ -48,8 +48,6 @@ public class NearbyMapFragment extends android.support.v4.app.Fragment {
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container,
                              Bundle savedInstanceState) {
-        View view = inflater.inflate(R.layout.fragment_nearby_map, container, false);
-        ButterKnife.bind(this, view);
         MapboxMapOptions options = new MapboxMapOptions()
                 .styleUrl(Style.OUTDOORS)
                 .camera(new CameraPosition.Builder()
@@ -60,9 +58,8 @@ public class NearbyMapFragment extends android.support.v4.app.Fragment {
         // create map
         mapView = new MapView(getActivity(), options);
         mapView.onCreate(savedInstanceState);
-        getActivity().setContentView(mapView);
         setHasOptionsMenu(false);
-        return view;
+        return mapView;
     }
 
     @Override
diff --git a/app/src/main/res/layout/fragment_nearby_map.xml b/app/src/main/res/layout/fragment_nearby_map.xml
deleted file mode 100644
index 33be54cdf..000000000
--- a/app/src/main/res/layout/fragment_nearby_map.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:mapbox="http://schemas.android.com/tools"
-    android:orientation="vertical"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-</LinearLayout>
\ No newline at end of file