diff --git a/src/deck-components/Menu.tsx b/src/deck-components/Menu.tsx
index afe1f25..b439f54 100755
--- a/src/deck-components/Menu.tsx
+++ b/src/deck-components/Menu.tsx
@@ -41,8 +41,8 @@ export const MenuGroup: FC<MenuGroupProps> = findModuleChild((m) => {
 
   for (let prop in m) {
     if (
-      (m[prop]?.toString()?.includes('bInGamepadUI:') &&
-        fakeRenderComponent(() => m[prop]())?.type?.prototype?.RenderSubMenu) ||
+      (m[prop]?.toString()?.includes?.('bInGamepadUI:') &&
+        fakeRenderComponent(() => m[prop]({overview: {appid: 7}}))?.type?.prototype?.RenderSubMenu) ||
       (m[prop]?.prototype?.RenderSubMenu && m[prop]?.prototype?.ShowSubMenu)
     ) {
       return m[prop];
diff --git a/src/deck-components/static-classes.ts b/src/deck-components/static-classes.ts
index ff876f2..0b9d93e 100644
--- a/src/deck-components/static-classes.ts
+++ b/src/deck-components/static-classes.ts
@@ -459,7 +459,7 @@ export const gamepadDialogClasses: GamepadDialogClasses = findModule(
   (mod) => typeof mod === 'object' && mod?.GamepadDialogContent?.includes('gamepaddialog'),
 );
 export const quickAccessControlsClasses: QuickAccessControlsClasses = findModule(
-  (mod) => typeof mod === 'object' && mod?.PanelSection?.includes('quickaccesscontrols'),
+  (mod) => typeof mod === 'object' && typeof mod?.PanelSection === 'string' && mod?.PanelSection?.includes('quickaccesscontrols'),
 );
 export const updaterFieldClasses: UpdaterFieldClasses = findModule(
   (mod) => typeof mod === 'object' && mod?.OOBEUpdateStatusContainer?.includes('updaterfield'),