diff --git a/app/common/directives/app-navigation.js b/app/common/directives/app-navigation.js
index 00c3ec7..daccb2f 100644
--- a/app/common/directives/app-navigation.js
+++ b/app/common/directives/app-navigation.js
@@ -12,6 +12,7 @@
                     'showNavigation': '='
                 },
                 'controller': ['$scope', '$location', 'dataService', function($scope, $location, dataService){
+                    $scope.dataService = dataService;
                     $scope.showSubMenu = false;
                     $scope.change = function(firstLevel){
                         if(firstLevel != $scope.firstLevel) {
@@ -24,6 +25,15 @@
                     $scope.closeSubnav = function(){
                         $scope.showSubMenu = false;
                     };
+                    $scope.$watch('path', function(){
+                        var urlRoot = $location.path().split("/")[1];
+                        if(urlRoot != ""){
+                            $scope.firstLevel = urlRoot;
+                        }else{
+                            $scope.firstLevel = 'overview';
+                        }
+                        $scope.showSubMenu = false;
+                    });
                     $scope.$watch('showNavigation', function(){
                         var paddingTop = 0;
                         var urlRoot = $location.path().split("/")[1];