diff --git a/app/src/main/java/de/sebse/fuplanner/MainActivity.java b/app/src/main/java/de/sebse/fuplanner/MainActivity.java
index a580f9d..1991b63 100644
--- a/app/src/main/java/de/sebse/fuplanner/MainActivity.java
+++ b/app/src/main/java/de/sebse/fuplanner/MainActivity.java
@@ -412,10 +412,10 @@ public class MainActivity extends AppCompatActivity
                 }, log::e);
                 break;
             case FRAGMENT_MODULES:
-                mNavigationView.setCheckedItem(R.id.nav_modules);
+                mNavigationView.getMenu().findItem(R.id.nav_modules).setChecked(true);
                 break;
             case FRAGMENT_SCHEDULE:
-                mNavigationView.setCheckedItem(R.id.nav_schedule);
+                mNavigationView.getMenu().findItem(R.id.nav_schedule).setChecked(true);
                 break;
             case FRAGMENT_CANTEENS_DETAILS:
                 getCanteenBrowser().getCanteens(success -> {
@@ -429,10 +429,10 @@ public class MainActivity extends AppCompatActivity
                 }, log::e);
                 break;
             case FRAGMENT_CANTEENS:
-                mNavigationView.setCheckedItem(R.id.nav_canteens);
+                mNavigationView.getMenu().findItem(R.id.nav_canteens).setChecked(true);
                 break;
             case FRAGMENT_PREFERENCES:
-                mNavigationView.setCheckedItem(R.id.nav_settings);
+                mNavigationView.getMenu().findItem(R.id.nav_settings).setChecked(true);
                 break;
             default:  // FRAGMENT_STARTUP / FRAGMENT_LOGIN
                 break;
@@ -561,7 +561,6 @@ public class MainActivity extends AppCompatActivity
     @Override
     public void refreshNavigation() {
         boolean isLoggedIn = getKVV().isLoggedIn() || mOfflineMode;
-        log.d("refreshNavigation2", getKVV().isLoggedIn(), mOfflineMode);
         setNavigationHeader(isLoggedIn);
         mNavigationView.getMenu().clear();
         if (isLoggedIn)
@@ -569,5 +568,6 @@ public class MainActivity extends AppCompatActivity
         else
             mNavigationView.inflateMenu(R.menu.activity_main_drawer);
         afterAnyMenuInflate(isLoggedIn);
+        setNavigationSelection(fragmentPage, fragmentData);
     }
 }