diff --git a/src/lib/components/menu/MenuButton.svelte b/src/lib/components/menu/MenuButton.svelte
index d72b566..f051f28 100644
--- a/src/lib/components/menu/MenuButton.svelte
+++ b/src/lib/components/menu/MenuButton.svelte
@@ -78,6 +78,7 @@
   $: propsWeControl = {
     id,
     type: resolveButtonType({ type: $$props.type, as }, $buttonStore),
+    disabled: disabled ? true : undefined,
     "aria-haspopup": true,
     "aria-controls": $itemsStore?.id,
     "aria-expanded": disabled ? undefined : $api.menuState === MenuStates.Open,
diff --git a/src/lib/components/menu/MenuItem.svelte b/src/lib/components/menu/MenuItem.svelte
index 6d56ff0..8b74baf 100644
--- a/src/lib/components/menu/MenuItem.svelte
+++ b/src/lib/components/menu/MenuItem.svelte
@@ -27,7 +27,6 @@
   $: data = { disabled, textValue } as MenuItemData;
 
   onMount(async () => {
-    await tick();
     $api.registerItem(id, data);
   });
 
diff --git a/src/lib/components/menu/MenuItems.svelte b/src/lib/components/menu/MenuItems.svelte
index d4cfe5d..d1eec7e 100644
--- a/src/lib/components/menu/MenuItems.svelte
+++ b/src/lib/components/menu/MenuItems.svelte
@@ -15,7 +15,7 @@
   const forwardEvents = forwardEventsBuilder(get_current_component());
   export let as: SupportedAs = "div";
   export let use: HTMLActionArray = [];
-  const api = useMenuContext("MenuButton");
+  const api = useMenuContext("MenuItems");
   const id = `headlessui-menu-items-${useId()}`;
   let searchDebounce: ReturnType<typeof setTimeout> | null = null;