diff --git a/spring-boot-admin-server-ui/src/main/frontend/components/sba-panel.vue b/spring-boot-admin-server-ui/src/main/frontend/components/sba-panel.vue
index 86fa9aca79b..e2149793fdf 100644
--- a/spring-boot-admin-server-ui/src/main/frontend/components/sba-panel.vue
+++ b/spring-boot-admin-server-ui/src/main/frontend/components/sba-panel.vue
@@ -31,7 +31,10 @@
       "
     >
       <h3 class="font-medium text-gray-900 flex-1">
-        <button class="flex items-center w-full" @click="$emit('title-click')">
+        <button
+          :class="classNames('flex items-center w-full', { 'cursor-pointer': $attrs.onTitleClick })"
+          @click="$emit('title-click')"
+        >
           <slot v-if="'prefix' in $slots" name="prefix" />
           <span v-text="title" />
           <span
diff --git a/spring-boot-admin-server-ui/src/main/frontend/views/instances/shell/sidebar.vue b/spring-boot-admin-server-ui/src/main/frontend/views/instances/shell/sidebar.vue
index ec2b5441a7c..aeb6035fd71 100644
--- a/spring-boot-admin-server-ui/src/main/frontend/views/instances/shell/sidebar.vue
+++ b/spring-boot-admin-server-ui/src/main/frontend/views/instances/shell/sidebar.vue
@@ -57,6 +57,7 @@
             params: { instanceId: instance.id },
           }"
           class="navbar-link navbar-link__group"
+          @click.prevent="toggleGroup(group.id)"
         >
           <span v-html="group.icon" />
           <span
@@ -230,12 +231,7 @@ watch(
   [() => route.fullPath, groups],
   () => {
     sidebarOpen.value = false;
-
-    const activeGroup = groups.value.find((group) =>
-      group.views.some((view: SbaView) => toRaw(view) === route.meta.view),
-    );
-
-    openGroup.value = activeGroup?.id ?? null;
+    openGroup.value = null;
   },
   { immediate: true },
 );
@@ -293,4 +289,4 @@ a.navbar-link {
 .navbar-link__group {
   @apply h-12 px-2 md:pl-6;
 }
-</style>
+</style>
\ No newline at end of file