diff --git a/entityreference_prepopulate.module b/entityreference_prepopulate.module
index 2a25682..aaab005 100644
--- a/entityreference_prepopulate.module
+++ b/entityreference_prepopulate.module
@@ -92,10 +92,6 @@ function entityreference_prepopulate_og_field_default_value($entity_type, $entit
  */
 function entityreference_prepopulate_field_attach_form($entity_type, $entity, &$form, &$form_state, $langcode) {
   list($id,,$bundle) = entity_extract_ids($entity_type, $entity);
-  if ($id) {
-    // Entity is already saved.
-    return;
-  }
 
   if (!empty($form_state['triggering_element']['#ajax'])) {
     // We are inside AJAX, so values can't be taken from URL at the
@@ -125,12 +121,12 @@ function entityreference_prepopulate_field_attach_form($entity_type, $entity, &$
       }
       $settings = $instance['settings']['behaviors']['prepopulate'];
 
-      if (!empty($settings['skip_perm']) && user_access($settings['skip_perm'])) {
+      if ((!empty($settings['skip_perm']) && user_access($settings['skip_perm'])) || ($id && !$settings['action_on_edit'])) {
         continue;
       }
 
       $field = $value['field'];
-      if (entityreference_prepopulate_get_values($field, $instance)) {
+      if (entityreference_prepopulate_get_values($field, $instance) || ($id && $settings['action_on_edit'])) {
         if ($settings['action'] == 'disable') {
           $form[$field_name][$lang]['#disabled'] = TRUE;
         }
diff --git a/plugins/behavior/EntityReferencePrepopulateInstanceBehavior.class.php b/plugins/behavior/EntityReferencePrepopulateInstanceBehavior.class.php
index fb0b70b..58cf8c7 100644
--- a/plugins/behavior/EntityReferencePrepopulateInstanceBehavior.class.php
+++ b/plugins/behavior/EntityReferencePrepopulateInstanceBehavior.class.php
@@ -18,6 +18,16 @@ class EntityReferencePrepopulateInstanceBehavior extends EntityReference_Behavio
       ),
       '#description' => t('Action to take when prepopulating field with values via URL.'),
     );
+    $form['action_on_edit'] = array(
+      '#type' => 'checkbox',
+      '#title' => t('Also apply on edit'),
+      '#description' => t('Apply action when editing the entity.'),
+      '#states' => array(
+        'invisible' => array(
+          ':input[name="instance[settings][behaviors][prepopulate][action]"]' => array('value' => 'none'),
+        ),
+      ),
+    );
     $form['fallback'] = array(
       '#type' => 'select',
       '#title' => t('Fallback behaviour'),
@@ -62,6 +72,7 @@ class EntityReferencePrepopulateInstanceBehavior extends EntityReference_Behavio
       '#description' => $description,
       '#disabled' => $disabled,
     );
+
     return $form;
   }
 }