diff --git a/src/registrar/assets/js/get-gov.js b/src/registrar/assets/js/get-gov.js
index 1813deea0..851de8fcf 100644
--- a/src/registrar/assets/js/get-gov.js
+++ b/src/registrar/assets/js/get-gov.js
@@ -390,24 +390,23 @@ function prepareDeleteButtons() {
  */
 (function triggerModalOnDsDataForm() {
   let saveButon = document.querySelector("#save-ds-data");
-  
-  // if (saveButon)
-  //   saveButon.addEventListener('click', triggerModalIfModalTriggerExists);
 
-  // function triggerModalIfModalTriggerExists(e){
+  // The view context will cause a hitherto hidden modal trigger to
+  // show up. On save, we'll test for that modal trigger appearing. We'll
+  // run that test once every 100 ms for 5 secs, which should balance performance
+  // while accounting for network or lag issues.
   if (saveButon) {
-        let i = 0;
-        var tryToTriggerModal = setInterval(function() {
-            i++;
-            if (i > 100) {
-              clearInterval(tryToTriggerModal);
-            }
-            let modalTrigger = document.querySelector("#ds-toggle-dnssec-alert");
-            if (modalTrigger) {
-              modalTrigger.click()
-              clearInterval(tryToTriggerModal);
-            }
-        }, 50);
-
+    let i = 0;
+    var tryToTriggerModal = setInterval(function() {
+        i++;
+        if (i > 100) {
+          clearInterval(tryToTriggerModal);
+        }
+        let modalTrigger = document.querySelector("#ds-toggle-dnssec-alert");
+        if (modalTrigger) {
+          modalTrigger.click()
+          clearInterval(tryToTriggerModal);
+        }
+    }, 50);
   }
 })();
diff --git a/src/registrar/tests/test_views.py b/src/registrar/tests/test_views.py
index 6614cf8e8..6bd59facb 100644
--- a/src/registrar/tests/test_views.py
+++ b/src/registrar/tests/test_views.py
@@ -1701,6 +1701,22 @@ class TestDomainDNSSEC(TestDomainOverview):
         )
         self.assertContains(page, "DS Data record 1")
 
+    def test_ds_data_form_modal(self):
+        """When user clicks on save, a modal pops up."""
+        add_data_page = self.app.get(
+            reverse("domain-dns-dnssec-dsdata", kwargs={"pk": self.domain_dsdata.id})
+        )
+        self.assertNotContains(add_data_page, "Trigger Disable DNSSEC Modal")
+        # Simulate a delete all data
+        form_data = {}
+        response = self.client.post(
+            reverse("domain-dns-dnssec-dsdata", kwargs={"pk": self.domain_dsdata.id}),
+            data=form_data,
+        )
+        self.assertEqual(response.status_code, 200)  # Adjust status code as needed
+        # Now check to see whether the JS trigger for the modal is present on the page
+        self.assertContains(response, "Trigger Disable DNSSEC Modal")
+
     def test_ds_data_form_submits(self):
         """DS Data form submits successfully