diff --git a/public/css/grocy.css b/public/css/grocy.css
index 0678d94f..876ccb3d 100644
--- a/public/css/grocy.css
+++ b/public/css/grocy.css
@@ -59,12 +59,12 @@ a.discrete-link:focus {
 .navbar-sidenav {
 	overflow-y: auto;
 	overflow-x: hidden;
+	border-top: 2px solid !important;
 }
 
 .navbar-sidenav,
 .sidenav-second-level {
 	background-color: #e5e5e5 !important;
-	border-top: 2px solid !important;
 	border-right: 2px solid !important;
 	border-color: #d6d6d6 !important;
 }
diff --git a/public/js/grocy.js b/public/js/grocy.js
index 88c8d6c0..3bad7f03 100644
--- a/public/js/grocy.js
+++ b/public/js/grocy.js
@@ -23,7 +23,14 @@ if (!Grocy.ActiveNav.isEmpty())
 {
 	var menuItem = $('#sidebarResponsive').find("[data-nav-for-page='" + Grocy.ActiveNav + "']");
 	menuItem.addClass('active-page');
-}	
+
+	var parentMenuSelector = menuItem.data("sub-menu-of");
+	if (typeof parentMenuSelector !== "undefined")
+	{
+		$(parentMenuSelector).collapse("show");
+		$(parentMenuSelector).prev(".nav-link-collapse").addClass("active-page");
+	}
+}
 
 $.timeago.settings.allowFuture = true;
 RefreshContextualTimeago = function()
diff --git a/views/layout/default.blade.php b/views/layout/default.blade.php
index aba4bec8..20d17def 100644
--- a/views/layout/default.blade.php
+++ b/views/layout/default.blade.php
@@ -113,31 +113,31 @@
 						<span class="nav-link-text">{{ $L('Manage master data') }}</span>
 					</a>
 					<ul id="top-nav-manager-master-data" class="sidenav-second-level collapse">
-						<li data-nav-for-page="products">
+						<li data-nav-for-page="products" data-sub-menu-of="#top-nav-manager-master-data">
 							<a class="nav-link discrete-link" href="{{ $U('/products') }}">
 								<i class="fab fa-product-hunt"></i>
 								<span class="nav-link-text">{{ $L('Products') }}</span>
 							</a>
 						</li>
-						<li data-nav-for-page="locations">
+						<li data-nav-for-page="locations" data-sub-menu-of="#top-nav-manager-master-data">
 							<a class="nav-link discrete-link" href="{{ $U('/locations') }}">
 								<i class="fas fa-map-marker-alt"></i>
 								<span class="nav-link-text">{{ $L('Locations') }}</span>
 							</a>
 						</li>
-						<li data-nav-for-page="quantityunits">
+						<li data-nav-for-page="quantityunits" data-sub-menu-of="#top-nav-manager-master-data">
 							<a class="nav-link discrete-link" href="{{ $U('/quantityunits') }}">
 								<i class="fas fa-balance-scale"></i>
 								<span class="nav-link-text">{{ $L('Quantity units') }}</span>
 							</a>
 						</li>
-						<li data-nav-for-page="habits">
+						<li data-nav-for-page="habits" data-sub-menu-of="#top-nav-manager-master-data">
 							<a class="nav-link discrete-link" href="{{ $U('/habits') }}">
 								<i class="fas fa-sync-alt"></i>
 								<span class="nav-link-text">{{ $L('Habits') }}</span>
 							</a>
 						</li>
-						<li data-nav-for-page="batteries">
+						<li data-nav-for-page="batteries" data-sub-menu-of="#top-nav-manager-master-data">
 							<a class="nav-link discrete-link" href="{{ $U('/batteries') }}">
 								<i class="fas fa-battery-three-quarters"></i>
 								<span class="nav-link-text">{{ $L('Batteries') }}</span>