diff --git a/commerce_fieldgroup_panes.module b/commerce_fieldgroup_panes.module
index 9de273b..0fdcfcb 100644
--- a/commerce_fieldgroup_panes.module
+++ b/commerce_fieldgroup_panes.module
@@ -71,6 +71,13 @@ function commerce_fieldgroup_panes_contents_checkout_form($form, &$form_state, $
       unset($pane_form[$child]);
     }
   }
+
+  // Check for form pre_render callback set by Fieldgroup 2.x.
+  $position = array_search('field_group_form_pre_render', $pane_form['#pre_render']);
+  if ($position !== FALSE) {
+    // Insert our pre_render callback.
+    array_splice($pane_form['#pre_render'], $position, 0, 'commerce_fieldgroup_panes_field_group_form_pre_render');
+  }
   return $pane_form;
 }
 
@@ -112,7 +119,7 @@ function commerce_fieldgroup_panes_contents_review($form, $form_state, $checkout
 
 /**
  * Implementation of hook_entity_info_alter
- * 
+ *
  * We need an additional view_mode. By altering the entity we can add
  * this view mode.
  */
@@ -123,3 +130,16 @@ function commerce_fieldgroup_panes_entity_info_alter(&$entity_info) {
     'custom settings' => FALSE,
   );
 }
+
+/**
+ * Pre render callback for rendering groups.
+ *
+ * @see field_group_field_attach_form
+ * @param $element Form that is beïng rendered.
+ *
+ * Runs immediately before field_group_form_pre_render() when Fieldgroup 2.x installed.
+ */
+function commerce_fieldgroup_panes_field_group_form_pre_render(&$element) {
+  $element['#groups'] = array_merge($element['#groups'], $element['#fieldgroups']);
+  return $element;
+}
\ No newline at end of file