From 3d4ec3181d1c031600a1f76eb57a062f15de0ab9 Mon Sep 17 00:00:00 2001
From: Joe Boccanfuso <109477394+jbocce@users.noreply.github.com>
Date: Fri, 18 Jul 2025 12:08:18 -0400
Subject: [PATCH] fix(multimonitor): Study browser more menu fixes (#5208)

---
 extensions/default/src/Components/MoreDropdownMenu.tsx      | 2 +-
 .../services/CustomizationService/CustomizationService.ts   | 6 +++++-
 platform/ui-next/src/components/ScrollArea/ScrollArea.tsx   | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/extensions/default/src/Components/MoreDropdownMenu.tsx b/extensions/default/src/Components/MoreDropdownMenu.tsx
index 2c8c2a2e6..125db1e15 100644
--- a/extensions/default/src/Components/MoreDropdownMenu.tsx
+++ b/extensions/default/src/Components/MoreDropdownMenu.tsx
@@ -41,7 +41,7 @@ const getMenuItemsDefault = ({ commandsManager, items, ...props }: withAppTypes)
     </DropdownMenuItem>
   );
 
-  const MenuItemComponent = menuContent?.content || DefaultMenuItem;
+  const MenuItemComponent = menuContent ?? DefaultMenuItem;
 
   return (
     <DropdownMenuContent
diff --git a/platform/core/src/services/CustomizationService/CustomizationService.ts b/platform/core/src/services/CustomizationService/CustomizationService.ts
index fd14b3bef..439810848 100644
--- a/platform/core/src/services/CustomizationService/CustomizationService.ts
+++ b/platform/core/src/services/CustomizationService/CustomizationService.ts
@@ -131,7 +131,11 @@ export default class CustomizationService extends PubSubService {
       }
     });
 
-    this.addReferences(this.configuration);
+    // Only add references for the configuration once.
+    if (!this.configuration?._hasBeenAdded) {
+      this.addReferences(this.configuration);
+      Object.defineProperty(this.configuration, '_hasBeenAdded', { value: true, writable: false });
+    }
   }
 
   public onModeEnter(): void {
diff --git a/platform/ui-next/src/components/ScrollArea/ScrollArea.tsx b/platform/ui-next/src/components/ScrollArea/ScrollArea.tsx
index 35f73701d..a87378808 100644
--- a/platform/ui-next/src/components/ScrollArea/ScrollArea.tsx
+++ b/platform/ui-next/src/components/ScrollArea/ScrollArea.tsx
@@ -56,7 +56,7 @@ const ScrollArea = React.forwardRef<
   return (
     <ScrollAreaPrimitive.Root
       ref={ref}
-      className={cn('relative h-full overflow-hidden', className)}
+      className={cn('relative h-full overflow-hidden', className, '[&>div>div]:!block')}
       type={props.type}
       {...props}
     >