diff --git a/gp-nested-forms/gpnf-attach-child-entry-by-field.php b/gp-nested-forms/gpnf-attach-child-entry-by-field.php
index 9e7108720..a76545a08 100644
--- a/gp-nested-forms/gpnf-attach-child-entry-by-field.php
+++ b/gp-nested-forms/gpnf-attach-child-entry-by-field.php
@@ -52,7 +52,11 @@ public function attach_child_entry_to_parent( $child_entry ) {
 	}
 
 	public function hide_parent_entry_id_field( $form ) {
-		if ( ! $this->is_applicable_child_form( $form ) || rgar( $_REQUEST, 'action' ) !== 'gpnf_refresh_markup' ) {
+		if ( 
+			! $this->is_applicable_child_form( $form ) || 
+			( ! in_array( rgar( $_REQUEST, 'action' ), array( 'gpnf_refresh_markup', 'gpnf_edit_entry' ), true ) 
+			  && ! rgpost( 'gform_submission_method' ) ) 
+		) {		
 			return $form;
 		}
 		foreach ( $form['fields'] as &$field ) {