1 files changed, 4 insertions, 0 deletions
diff --git a/app/src/main/java/se/leap/bitmaskclient/base/fragments/NavigationDrawerFragment.java b/app/src/main/java/se/leap/bitmaskclient/base/fragments/NavigationDrawerFragment.java
index fe36e00a..5c4e891e 100644
--- a/app/src/main/java/se/leap/bitmaskclient/base/fragments/NavigationDrawerFragment.java
+++ b/app/src/main/java/se/leap/bitmaskclient/base/fragments/NavigationDrawerFragment.java
@@ -307,6 +307,10 @@ public class NavigationDrawerFragment extends Fragment implements SharedPreferen
         manualGatewaySelection.setOnClickListener(v -> {
             FragmentManagerEnhanced fragmentManager = new FragmentManagerEnhanced(getActivity().getSupportFragmentManager());
             closeDrawer();
+            Fragment current = fragmentManager.findFragmentByTag(MainActivity.TAG);
+            if (current instanceof GatewaySelectionFragment) {
+                return;
+            }
             Fragment fragment = new GatewaySelectionFragment();
             fragmentManager.replace(R.id.main_container, fragment, MainActivity.TAG);
         });