diff --git a/addon/components/menu/item-element.hbs b/addon/components/menu/item-element.hbs
index 632608aa..d34f5a97 100644
--- a/addon/components/menu/item-element.hbs
+++ b/addon/components/menu/item-element.hbs
@@ -1,5 +1,5 @@
 {{#let
-  (if this.tagNameIsComponent @tagName (element (or @tagName 'a')))
+  (if (tag-name-is-component @tagName) @tagName (element (or @tagName 'a')))
   as |Tag|
 }}
   <Tag
diff --git a/addon/components/menu/item-element.js b/addon/components/menu/item-element.js
deleted file mode 100644
index ae8b83c3..00000000
--- a/addon/components/menu/item-element.js
+++ /dev/null
@@ -1,7 +0,0 @@
-import Component from '@glimmer/component';
-
-export default class MenuItemElement extends Component {
-  get tagNameIsComponent() {
-    return typeof this.args.tagName === 'object';
-  }
-}
diff --git a/addon/helpers/tag-name-is-component.js b/addon/helpers/tag-name-is-component.js
new file mode 100644
index 00000000..300968f9
--- /dev/null
+++ b/addon/helpers/tag-name-is-component.js
@@ -0,0 +1,7 @@
+import { helper } from '@ember/component/helper';
+
+function tagNameIsComponent([as]) {
+  return typeof as === 'object';
+}
+
+export default helper(tagNameIsComponent);
diff --git a/app/helpers/tag-name-is-component.js b/app/helpers/tag-name-is-component.js
new file mode 100644
index 00000000..133099a6
--- /dev/null
+++ b/app/helpers/tag-name-is-component.js
@@ -0,0 +1 @@
+export { default } from 'ember-headlessui/helpers/tag-name-is-component';