diff --git a/docs/components/content/ComponentCard.vue b/docs/components/content/ComponentCard.vue
index f515f216..9d3837f4 100644
--- a/docs/components/content/ComponentCard.vue
+++ b/docs/components/content/ComponentCard.vue
@@ -11,7 +11,7 @@
           class="justify-center"
         />
         <USelectMenu
-          v-else-if="prop.type === 'string' && prop.options.length && prop.name !== 'label'"
+          v-else-if="prop.options.length && prop.name !== 'label'"
           v-model="componentProps[prop.name]"
           :options="prop.options"
           :name="`prop-${prop.name}`"
diff --git a/docs/content/2.elements/5.button.md b/docs/content/2.elements/5.button.md
index e28747c5..6754a8b6 100644
--- a/docs/content/2.elements/5.button.md
+++ b/docs/content/2.elements/5.button.md
@@ -276,12 +276,14 @@ excludedProps:
 To stack buttons as a group, use the `ButtonGroup` component.
 
 - To size all the buttons equally, pass the `size` prop
+- To change the orientation of the buttons, set the `orientation` prop to `vertical`
 - To adjust the rounded or the shadow around buttons, customize with `ui.buttonGroup.rounded` or `ui.buttonGroup.shadow`
 
 ::component-card{slug="ButtonGroup"}
 ---
 props:
   size: 'sm'
+  orientation: 'horizontal'
 ui:
   size:
     2xs: ''
@@ -290,6 +292,9 @@ ui:
     md: ''
     lg: ''
     xl: ''
+  orientation:
+    horizontal: ''
+    vertical: ''
 code: |
   <UButton label="Action" color="white" />
     <UButton icon="i-heroicons-chevron-down-20-solid" color="gray" />
diff --git a/src/runtime/components/elements/ButtonGroup.ts b/src/runtime/components/elements/ButtonGroup.ts
index 142d0811..928061a3 100644
--- a/src/runtime/components/elements/ButtonGroup.ts
+++ b/src/runtime/components/elements/ButtonGroup.ts
@@ -20,6 +20,13 @@ export default defineComponent({
         return Object.keys(appConfig.ui.button.size).includes(value)
       }
     },
+    orientation: {
+      type: String as PropType<'horizontal' | 'vertical'>,
+      default: 'horizontal',
+      validator (value: string) {
+        return ['horizontal', 'vertical'].includes(value)
+      }
+    },
     ui: {
       type: Object as PropType<Partial<typeof appConfig.ui.buttonGroup>>,
       default: () => ({})
@@ -33,21 +40,30 @@ export default defineComponent({
 
     const children = computed(() => getSlotsChildren(slots))
 
-    const rounded = computed(() => ({
-      'rounded-none': { left: 'rounded-s-none', right: 'rounded-e-none' },
-      'rounded-sm': { left: 'rounded-s-sm', right: 'rounded-e-sm' },
-      rounded: { left: 'rounded-s', right: 'rounded-e' },
-      'rounded-md': { left: 'rounded-s-md', right: 'rounded-e-md' },
-      'rounded-lg': { left: 'rounded-s-lg', right: 'rounded-e-lg' },
-      'rounded-xl': { left: 'rounded-s-xl', right: 'rounded-e-xl' },
-      'rounded-2xl': { left: 'rounded-s-2xl', right: 'rounded-e-2xl' },
-      'rounded-3xl': { left: 'rounded-s-3xl', right: 'rounded-e-3xl' },
-      'rounded-full': { left: 'rounded-s-full', right: 'rounded-e-full' }
-    }[ui.value.rounded]))
+    const rounded = computed(() => {
+      const roundedMap = {
+        'rounded-none': { horizontal: { left: 'rounded-s-none', right: 'rounded-e-none' }, vertical: { top: 'rounded-t-none', bottom: 'rounded-b-none' } },
+        'rounded-sm': { horizontal: { left: 'rounded-s-sm', right: 'rounded-e-sm' }, vertical: { top: 'rounded-t-sm', bottom: 'rounded-b-sm' } },
+        rounded: { horizontal: { left: 'rounded-s', right: 'rounded-e' }, vertical: { top: 'rounded-t', bottom: 'rounded-b' } },
+        'rounded-md': { horizontal: { left: 'rounded-s-md', right: 'rounded-e-md' }, vertical: { top: 'rounded-t-md', bottom: 'rounded-b-md' } },
+        'rounded-lg': { horizontal: { left: 'rounded-s-lg', right: 'rounded-e-lg' }, vertical: { top: 'rounded-t-lg', bottom: 'rounded-b-lg' } },
+        'rounded-xl': { horizontal: { left: 'rounded-s-xl', right: 'rounded-e-xl' }, vertical: { top: 'rounded-t-xl', bottom: 'rounded-b-xl' } },
+        'rounded-2xl': { horizontal: { left: 'rounded-s-2xl', right: 'rounded-e-2xl' }, vertical: { top: 'rounded-t-2xl', bottom: 'rounded-b-2xl' } },
+        'rounded-3xl': { horizontal: { left: 'rounded-s-3xl', right: 'rounded-e-3xl' }, vertical: { top: 'rounded-t-3xl', bottom: 'rounded-b-3xl' } },
+        'rounded-full': { horizontal: { left: 'rounded-s-full', right: 'rounded-e-full' }, vertical: { top: 'rounded-t-full', bottom: 'rounded-b-full' } }
+      }
+      return roundedMap[ui.value.rounded][props.orientation]
+    })
 
     const clones = computed(() => children.value.map((node, index) => {
       const vProps: any = {}
 
+      if (props.orientation === 'vertical') {
+        ui.value.wrapper = 'flex flex-col -space-y-px'
+      } else {
+        ui.value.wrapper = 'inline-flex -space-x-px'
+      }
+
       if (props.size) {
         vProps.size = props.size
       }
@@ -57,11 +73,11 @@ export default defineComponent({
       vProps.ui.base = '!shadow-none'
 
       if (index === 0) {
-        vProps.ui.rounded += ` ${rounded.value.left}`
+        vProps.ui.rounded += ` ${rounded.value.left || rounded.value.top}`
       }
 
       if (index === children.value.length - 1) {
-        vProps.ui.rounded += ` ${rounded.value.right}`
+        vProps.ui.rounded += ` ${rounded.value.right || rounded.value.bottom}`
       }
 
       return cloneVNode(node, vProps)