diff --git a/src/FormulateGrouping.vue b/src/FormulateGrouping.vue
index 50576d6..abf423e 100644
--- a/src/FormulateGrouping.vue
+++ b/src/FormulateGrouping.vue
@@ -1,6 +1,7 @@
 <template>
   <FormulateSlot
     name="grouping"
+    class="formulate-input-grouping"
     :context="context"
   >
     <FormulateRepeatableProvider
diff --git a/src/FormulateSlot.js b/src/FormulateSlot.js
index 99d5d76..a3485be 100644
--- a/src/FormulateSlot.js
+++ b/src/FormulateSlot.js
@@ -9,6 +9,10 @@ export default {
     if (p.$scopedSlots && p.$scopedSlots[props.name]) {
       return p.$scopedSlots[props.name](props.context || props)
     }
-    return h('div', data, children)
+    if (children.length > 1) {
+      const { name, context, ...attrs } = data.attrs
+      return h('div', { ...data, ...{ attrs } }, children)
+    }
+    return children[0]
   }
 }