diff --git a/app/src/main/java/de/sebse/fuplanner/MainActivity.java b/app/src/main/java/de/sebse/fuplanner/MainActivity.java
index 49466f1..0b43589 100644
--- a/app/src/main/java/de/sebse/fuplanner/MainActivity.java
+++ b/app/src/main/java/de/sebse/fuplanner/MainActivity.java
@@ -309,6 +309,12 @@ public class MainActivity extends AppCompatActivity
                 }
             }, error -> log.e("Modules.error", error));
         }
+        if (newFragment == FRAGMENT_MODULES_DETAILS) {
+            int size = mNavigationView.getMenu().size();
+            for (int k = 0; k < size; k++) {
+                mNavigationView.getMenu().getItem(k).setChecked(mNavigationView.getMenu().getItem(k).getOrder() == 101+newData);
+            }
+        }
 
         this.fragmentPage = newFragment;
         this.fragmentStatus = newData;
@@ -321,9 +327,6 @@ public class MainActivity extends AppCompatActivity
 
 
 
-
-
-
     @Override
     public void onLoginFragmentInteraction(LoginToken loginToken) {
         toLoginState(loginToken.getFullname(), loginToken.getEmail());
@@ -331,16 +334,9 @@ public class MainActivity extends AppCompatActivity
 
     @Override
     public void onModulesFragmentInteraction(final int itemPosition) {
-        log.d("Item clicked", itemPosition);
         setTitle(R.string.courses);
         getKVV().getModuleList(success -> setTitle(success.get(itemPosition).title), error -> log.e(error));
         changeFragment(FRAGMENT_MODULES_DETAILS, itemPosition);
-
-        int size = mNavigationView.getMenu().size();
-        for (int k = 0; k < size; k++) {
-            mNavigationView.getMenu().getItem(k).setChecked(mNavigationView.getMenu().getItem(k).getOrder() == 101+itemPosition);
-            //mNavigationView.getMenu().getItem(k).setChecked(false);
-        }
     }
 
     @Override