diff --git a/On_Form_Submit_Actions/close-popup-and-create-cookie-on-form-submit.php b/On_Form_Submit_Actions/close-popup-and-create-cookie-on-form-submit.php
index cd60ac7..6aa1415 100644
--- a/On_Form_Submit_Actions/close-popup-and-create-cookie-on-form-submit.php
+++ b/On_Form_Submit_Actions/close-popup-and-create-cookie-on-form-submit.php
@@ -4,28 +4,38 @@
  *  'functions.php' file starting with 'add_action()'.
  * -------------------------------------------------------------------------- */
 add_action( 'wp_footer', 'my_custom_popup_scripts', 500 );
+
 /**
  *  Add custom JS script to footer to set a cookie that targets a popup by it's ID.
  *
  *  Note: Popups are assigned a unique ID of '#popmake-{integer}'.
  *  From the WP Admin, view 'Popup Maker' -> 'All Popups' -> 'CSS Classes (column)'
  *  to locate the popup ID formatted as 'popmake-{integer}'. Change the placeholder
- *  ID ( '#popmake-967' ) in this code sample with your site's unique popup ID.
+ *  ID ( '#popmake-967' and '#pum-967' ) in this code sample with your site's unique popup ID.
  *
  *  @since 1.0.0
  *
  *  @return void
  */
-function my_custom_popup_scripts() { ?>
-	<script type="text/javascript">
+function my_custom_popup_scripts() {
+?>
+    <script type="text/javascript">
         (function ($, document, undefined) {
 
-            jQuery('#popmake-967').trigger('pumSetCookie');
+            // Set popup cookie and close popup when the form in the popup is submitted
+            jQuery(document).on('submit', '#pum-967 .popmake-content .kb-form', function() {
+
+                const $popup = PUM.getPopup(this);
+				
+                $popup.trigger('pumSetCookie');
 
-            setTimeout(function () {
-                jQuery('#popmake-967').popmake('close');
-            }, 5000); // 5 seconds
+                setTimeout(function () {
+                    jQuery('#popmake-967').popmake('close');
+                }, 5000); // 5 seconds
+
+            });
 
         }(jQuery, document))
-	</script><?php
+    </script>
+<?php
 }
\ No newline at end of file