diff --git a/lib.php b/lib.php
index 48bc319e02340ee19111c11443a7a5bfbe6cb741..2973385930c1db009d43833ff5e6d5bb6f4c494d 100644
--- a/lib.php
+++ b/lib.php
@@ -28,6 +28,8 @@ include_once($CFG->dirroot . '/local/hsh_boostnavigation/locallib.php');
 function local_hsh_boostnavigation_extend_navigation(global_navigation $navigation) {
     global $CFG, $PAGE;
 
+    $todaysSemesterNodeKey = getFirstDayOfSem(strtotime("now"));
+
     $collapsenodesforjs[] = '';
     $semesterList[] = '';
     $semesterKeys[] = '';
@@ -86,11 +88,6 @@ function local_hsh_boostnavigation_extend_navigation(global_navigation $navigati
         // Semesterliste sortieren (Neuestes Semeste oben)
         if($semesterOrder == 0) { // Wenn die Order auf 1 ist -> Neueste Unten
             rsort($semesterList);
-            if(isset($semesterList[0])) {
-                $newestNode = $semesterList[0];
-            } else {
-                $newestNode = $unabhaengig;
-            }
         }
 
         // Position der Semesterunabhängigen Kurse - Oberhalb der Semester
@@ -104,7 +101,6 @@ function local_hsh_boostnavigation_extend_navigation(global_navigation $navigati
         if($semesterOrder == 0) {
             // Neueste Oben
             if(isset($semesterList[0])) {
-                $newestNode = $semesterList[0]->key;
                 for ($i = 0; $i < $maxSemesters; $i++) {
                     if($i < sizeof($semesterList) && $semesterList[$i]) {
                         $customnav->add_node($semesterList[$i]);
@@ -112,14 +108,11 @@ function local_hsh_boostnavigation_extend_navigation(global_navigation $navigati
                         break;
                     }
                 }
-            } else {
-                $newestNode = $unabhaengig;
             }
 
         } else {
             // Neueste Unten
             $count = sizeof($semesterList) - $maxSemesters;
-            $newestNode = $semesterList[sizeof($semesterList)-1]->key;
             if ($count < 0) {
                 $count = 0;
             }
@@ -168,6 +161,6 @@ function local_hsh_boostnavigation_extend_navigation(global_navigation $navigati
 
     // if settings gewählt "aktuelles Semester aufklappen"
     if($openNewestSemester) {
-        $PAGE->requires->js_call_amd('local_hsh_boostnavigation/collapse', 'openSemester', [$newestNode]);
+        $PAGE->requires->js_call_amd('local_hsh_boostnavigation/collapse', 'openSemester', [$todaysSemesterNodeKey]);
     }
 }
\ No newline at end of file
diff --git a/version.php b/version.php
index 5f9f7d03c2117332490d568551eced1f05f39db7..4e76917319eede77867494beae681378f7de0a39 100644
--- a/version.php
+++ b/version.php
@@ -26,8 +26,8 @@
 defined('MOODLE_INTERNAL') || die();
 
 $plugin->component = 'local_hsh_boostnavigation';
-$plugin->version = 2018091600;
-$plugin->release = 'v1.1-r6';
+$plugin->version = 2019020600;
+$plugin->release = 'v1.1-r7';
 
 $plugin->requires = 2016120500;
 #$plugin->maturity = MATURITY_STABLE;