1 files changed, 5 insertions, 0 deletions
diff --git a/settings/Controller/CommonSettingsTrait.php b/settings/Controller/CommonSettingsTrait.php
index 82d675531a8..3d314d9ed53 100644
--- a/settings/Controller/CommonSettingsTrait.php
+++ b/settings/Controller/CommonSettingsTrait.php
@@ -25,6 +25,7 @@
 namespace OC\Settings\Controller;
 
 use OCP\AppFramework\Http\TemplateResponse;
+use OCP\INavigationManager;
 use OCP\Settings\IManager as ISettingsManager;
 use OCP\Settings\IIconSection;
 use OCP\Settings\ISettings;
@@ -33,6 +34,9 @@ trait CommonSettingsTrait  {
 	/** @var ISettingsManager */
 	private $settingsManager;
 
+	/** @var INavigationManager */
+	private $navigationManager;
+
 	/**
 	 * @param string $currentSection
 	 * @return array
@@ -116,6 +120,7 @@ trait CommonSettingsTrait  {
 	}
 
 	private function getIndexResponse($type, $section) {
+		$this->navigationManager->setActiveEntry('settings');
 		$templateParams = [];
 		$templateParams = array_merge($templateParams, $this->getNavigationParameters($type, $section));
 		$templateParams = array_merge($templateParams, $this->getSettings($section));