diff --git a/revision_scheduler.pages.inc b/revision_scheduler.pages.inc
index fce2b2b..0be62cc 100644
--- a/revision_scheduler.pages.inc
+++ b/revision_scheduler.pages.inc
@@ -148,12 +148,27 @@ function revision_scheduler_edit_form($form, &$form_state, $operation, $entity =
     $operation->revision_id = $revision_id;
   }
 
-  $revision_ids = revision_scheduler_get_all_entity_revision_ids($operation->entity_type, $operation->entity_id);
-  $revisions = revision_scheduler_entity_revision_load_multiple($operation->entity_type, $operation->entity_id, $revision_ids);
-  krsort($revisions);
+  // Check to see if we're on the node edit form or the moderation schedule form.
+  if(isset($form['#group']) && $form['#group'] == 'additional_settings') {
+
+    $revision_ids = revision_scheduler_get_all_entity_revision_ids($operation->entity_type, $operation->entity_id);
+    $revision_id = (int) reset($revision_ids);
+    $revision = revision_scheduler_entity_revision_load($operation->entity_type, $operation->entity_id, $revision_id);
+
+    if (empty($entity) && !empty($operation->revision_id)) {
+      $entity = entity_revision_load($operation->entity_type, $revision_id);
+    }
 
-  if (empty($entity) && !empty($operation->revision_id) && !empty($revisions[$operation->revision_id])) {
-    $entity = $revisions[$operation->revision_id];
+  }
+  else {
+
+    $revision_ids = revision_scheduler_get_all_entity_revision_ids($operation->entity_type, $operation->entity_id);
+    $revisions = revision_scheduler_entity_revision_load_multiple($operation->entity_type, $operation->entity_id, $revision_ids);
+    krsort($revisions);
+
+    if (empty($entity) && !empty($operation->revision_id) && !empty($revisions[$operation->revision_id])) {
+      $entity = $revisions[$operation->revision_id];
+    }
   }
 
   $wrapper = 'revision-scheduler-operation-wrapper-' . $operation->entity_type . '-' . (int) $operation->entity_id . '-' . (int) $operation->id;
@@ -170,8 +185,11 @@ function revision_scheduler_edit_form($form, &$form_state, $operation, $entity =
       'effect' => 'fade',
     ),
   );
-  foreach ($revisions as $revision_id => $revision) {
-    $form['revision_id']['#options'][$revision_id] = t('Revision @id: @label', array('@id' => $revision_id, '@label' => entity_label($operation->entity_type, $revision)));
+  // Only include this if we're on the moderation schedule form.
+  if (!isset($form['#group'])) {
+    foreach ($revisions as $revision_id => $revision) {
+      $form['revision_id']['#options'][$revision_id] = t('Revision @id: @label', array('@id' => $revision_id, '@label' => entity_label($operation->entity_type, $revision)));
+    }
   }
 
   $form['operation'] = array(