diff --git a/fape.module b/fape.module
index 3c9c3e5..ee0cc4c 100644
--- a/fape.module
+++ b/fape.module
@@ -119,7 +119,6 @@ function fape_field_edit_page($entity_type, $entity_id, $field_name, $langcode =
 
   $output = drupal_build_form('fape_field_edit_form', $form_state);
   if (!empty($form_state['executed'])) {
-    entity_save($entity_type, $form_state['entity']);
     drupal_goto($form_state['redirect']);
   }
   return $output;
@@ -433,6 +432,7 @@ function fape_field_edit_form_submit($form, &$form_state) {
     $entity->revision = $form_state['values']['revision'];
     $entity->log = $form_state['values']['log'];
   }
+  entity_save($form_state['entity_type'], $form_state['entity']);
 }
 
 /**