diff --git a/includes/form.inc b/includes/form.inc
index 8a6b342e872beffbdc74433db62c6faab14ffec2..9749b470c5da2e52a6075931cfbd9879b6d607e7 100644
--- a/includes/form.inc
+++ b/includes/form.inc
@@ -14,7 +14,7 @@ function bootstrap_form_alter(&$form, &$form_state, $form_id) {
   );
 
   // Only wrap in container for certain form
-  if (isset($form['#form_id']) && !in_array($form['#form_id'], $form_ids) && !isset($form['#node_edit_form'])) {
+  if (isset($form['#form_id']) && !in_array($form['#form_id'], $form_ids) && !isset($form['#node_edit_form']) && isset($form['actions']) && ($form['actions']['#type'] == 'actions')) {
     $form['actions']['#theme_wrappers'] = array();
   }
 }