diff --git a/includes/common.inc b/includes/common.inc
index 93bfae0..2c00856 100644
--- a/includes/common.inc
+++ b/includes/common.inc
@@ -162,7 +162,18 @@ function panelizer_add_revision_info_form(&$form, &$form_state) {
       $form['#submit'][] = $form_state['input']['form_id'] . '_submit';
     }
 
-    $form['#submit'][] = 'panelizer_add_revision_info_form_submit';
+    // The submit handler needs to go in different locations depending on which
+    // form this is.
+    $submit_handler = 'panelizer_add_revision_info_form_submit';
+    if (!empty($form['buttons']['submit']['#submit'])) {
+      $form['buttons']['submit']['#submit'][] = $submit_handler;
+    }
+    elseif (!empty($form['buttons']['return']['#submit'])) {
+      $form['buttons']['return']['#submit'][] = $submit_handler;
+    }
+    else {
+      $form['#submit'][] = $submit_handler;
+    }
   }
 }