1 files changed, 11 insertions, 2 deletions
diff --git a/lib/private/templatelayout.php b/lib/private/templatelayout.php
index 0e1a8f33c45..998a683d841 100644
--- a/lib/private/templatelayout.php
+++ b/lib/private/templatelayout.php
@@ -94,17 +94,26 @@ class OC_TemplateLayout extends OC_Template {
 			}
 
 			// Add navigation entry
-			$this->assign( 'application', '', false );
+
+			$this->assign( 'application', '');
 			$this->assign( 'appid', $appId );
 			$navigation = OC_App::getNavigation();
 			$this->assign( 'navigation', $navigation);
-			$this->assign( 'settingsnavigation', OC_App::getSettingsNavigation());
+			$settingsNavigation = OC_App::getSettingsNavigation();
+			$this->assign( 'settingsnavigation', $settingsNavigation);
 			foreach($navigation as $entry) {
 				if ($entry['active']) {
 					$this->assign( 'application', $entry['name'] );
 					break;
 				}
 			}
+			
+			foreach($settingsNavigation as $entry) {
+				if ($entry['active']) {
+					$this->assign( 'application', $entry['name'] );
+					break;
+				}
+			}
 			$userDisplayName = OC_User::getDisplayName();
 			$this->assign('user_displayname', $userDisplayName);
 			$this->assign('user_uid', OC_User::getUser());