diff --git a/app/components/Button/Base.vue b/app/components/Button/Base.vue
index 1a142b193f..48997ac550 100644
--- a/app/components/Button/Base.vue
+++ b/app/components/Button/Base.vue
@@ -44,7 +44,7 @@ defineExpose({
 <template>
   <button
     ref="el"
-    class="group gap-x-1 items-center justify-center font-mono border border-border rounded-md transition-all duration-200 disabled:(opacity-40 cursor-not-allowed border-transparent)"
+    class="group gap-x-1 items-center justify-center font-mono border border-border rounded-md transition-all duration-200 cursor-pointer disabled:(opacity-40 cursor-not-allowed border-transparent)"
     :class="{
       'inline-flex': !block,
       'flex': block,
diff --git a/test/nuxt/components/ButtonBase.spec.ts b/test/nuxt/components/ButtonBase.spec.ts
new file mode 100644
index 0000000000..a552c37545
--- /dev/null
+++ b/test/nuxt/components/ButtonBase.spec.ts
@@ -0,0 +1,34 @@
+import { describe, expect, it } from 'vitest'
+import { mountSuspended } from '@nuxt/test-utils/runtime'
+import ButtonBase from '~/components/Button/Base.vue'
+
+describe('ButtonBase', () => {
+  it('has cursor-pointer class on enabled button', async () => {
+    const wrapper = await mountSuspended(ButtonBase)
+    const button = wrapper.find('button')
+    expect(button.classes()).toContain('cursor-pointer')
+  })
+
+  it('has cursor-not-allowed on disabled state via class', async () => {
+    const wrapper = await mountSuspended(ButtonBase, {
+      props: { disabled: true },
+    })
+    const button = wrapper.find('button')
+    // The class string includes the disabled modifier with cursor-not-allowed
+    expect(button.attributes('class')).toContain('cursor-not-allowed')
+  })
+
+  it('does not have disabled attribute when not disabled', async () => {
+    const wrapper = await mountSuspended(ButtonBase)
+    const button = wrapper.find('button')
+    expect(button.attributes('disabled')).toBeUndefined()
+  })
+
+  it('has disabled attribute when disabled prop is true', async () => {
+    const wrapper = await mountSuspended(ButtonBase, {
+      props: { disabled: true },
+    })
+    const button = wrapper.find('button')
+    expect(button.attributes('disabled')).toBeDefined()
+  })
+})