diff --git a/plugins/catalog/src/alpha/pages.test.tsx b/plugins/catalog/src/alpha/pages.test.tsx
index cc83b9168b..0b35e63979 100644
--- a/plugins/catalog/src/alpha/pages.test.tsx
+++ b/plugins/catalog/src/alpha/pages.test.tsx
@@ -721,18 +721,27 @@ describe('Entity page', () => {
       );
 
       const { disabled } = params.useProps();
-      await waitFor(async () => {
-        await userEvent.click(screen.getByTestId('menu-button'));
-        expect(screen.getByText('Test Title')).toBeInTheDocument();
-        expect(screen.getByText('Test Icon')).toBeInTheDocument();
-        const listItem = screen.getByText('Test Title').closest('li');
-        expect(listItem).toHaveAttribute('aria-disabled', disabled.toString());
-        if (!disabled) {
-          await userEvent.click(screen.getByText('Test Title'));
-        }
 
-        expect(onClickMock).toHaveBeenCalledTimes(disabled ? 0 : 1);
-      });
+      // Wait for entity to load first
+      await waitFor(() =>
+        expect(screen.getByText(/artist-lookup/)).toBeInTheDocument(),
+      );
+
+      await userEvent.click(screen.getByTestId('menu-button'));
+
+      // Wait for menu to open
+      await waitFor(() =>
+        expect(screen.getByText('Test Title')).toBeInTheDocument(),
+      );
+
+      expect(screen.getByText('Test Icon')).toBeInTheDocument();
+      const listItem = screen.getByText('Test Title').closest('li');
+      expect(listItem).toHaveAttribute('aria-disabled', disabled.toString());
+      if (!disabled) {
+        await userEvent.click(screen.getByText('Test Title'));
+      }
+
+      expect(onClickMock).toHaveBeenCalledTimes(disabled ? 0 : 1);
     });
 
     it.each([