diff --git a/gravity-forms/gw-disable-submit-button-until-required-fields-are-filled-out.php b/gravity-forms/gw-disable-submit-button-until-required-fields-are-filled-out.php
index 0e1af26dd..a37bdde93 100644
--- a/gravity-forms/gw-disable-submit-button-until-required-fields-are-filled-out.php
+++ b/gravity-forms/gw-disable-submit-button-until-required-fields-are-filled-out.php
@@ -32,14 +32,15 @@ public function maybe_output_script( $form ) {
 		}
 
 		if ( ! self::$script_output ) {
-			$this->script();
+			add_action( 'wp_footer', array( $this, 'output_script' ) );
+			add_action( 'gform_preview_footer', array( $this, 'output_script' ) );
 			self::$script_output = true;
 		}
 
 		return $form;
 	}
 
-	public function script() {
+	public function output_script() {
 		?>
 
 		<script type="text/javascript">
@@ -83,6 +84,15 @@ public function script() {
 							self.runCheck();
 						});
 
+						// Check when fields are repopulated because of GPPA
+						$(document).on( 'gppa_updated_batch_fields', function() {
+							self.runCheck();
+						});
+						// GPPA logic may enable submit button, disable that logic.
+						gform.addFilter( 'gppa_disable_form_navigation_toggling', function() { 
+							return true; 
+						});
+
 						self.runCheck();
 
 					}