diff --git a/shared/ui/Stream/ObservabilityServiceEntity.tsx b/shared/ui/Stream/ObservabilityServiceEntity.tsx
index 04165b593ab..136cfe2882d 100644
--- a/shared/ui/Stream/ObservabilityServiceEntity.tsx
+++ b/shared/ui/Stream/ObservabilityServiceEntity.tsx
@@ -219,9 +219,10 @@ export const ObservabilityServiceEntity = React.memo((props: Props) => {
 											) {
 												setExpandedEntityCallback(undefined);
 												setCurrentRepoIdCallback(e.repoId);
-												setExpandedEntityUserPrefCallback(ea.entityGuid);
 												setTimeout(() => {
 													doRefreshCallback(true);
+													setExpandedEntityUserPrefCallback(ea.entityGuid);
+													setExpandedEntityCallback(ea.entityGuid);
 												}, 1000);
 											}
 										}}