diff --git a/js/builder.es6.js b/js/builder.es6.js
index 57c7f11d668809b17f5bb559a716e68f4b602301..c0c105058ab4f1750cb284e1fd99d35f70426ef4 100644
--- a/js/builder.es6.js
+++ b/js/builder.es6.js
@@ -526,17 +526,13 @@
   // Repositions open dialogs.
   // @see https://www.drupal.org/project/layout_paragraphs/issues/3252978
   // @see https://stackoverflow.com/questions/5456298/refresh-jquery-ui-dialog-position
-  let lpDialogInterval;
   $(window).on('dialog:aftercreate', (event, dialog, $dialog) => {
     if ($dialog[0].id.indexOf('lpb-dialog-') === 0) {
-      if (lpDialogInterval) {
-        clearInterval(lpDialogInterval);
-      }
       $dialog.data('lpOriginalHeight', $dialog.outerHeight());
-      lpDialogInterval = setInterval(repositionDialog.bind(null, $dialog), 500);
+      $dialog.data('lpDialogInterval', setInterval(repositionDialog.bind(null, $dialog), 500));
     }
   });
-  $(window).on('dialog:beforeclose', () => {
-    clearInterval(lpDialogInterval);
+  $(window).on('dialog:beforeclose', (event, dialog, $dialog) => {
+    clearInterval($dialog.data('lpDialogInterval'));
   });
 })(jQuery, Drupal, Drupal.debounce, dragula);
diff --git a/js/builder.js b/js/builder.js
index c84ab0b35348c32a46482ca8e57f59b852b8f593..5a5faff4650e75fe1cf8656ca1d06c5f99dcbe7b 100644
--- a/js/builder.js
+++ b/js/builder.js
@@ -401,18 +401,13 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
       }
     }
   });
-  var lpDialogInterval;
   $(window).on('dialog:aftercreate', function (event, dialog, $dialog) {
     if ($dialog[0].id.indexOf('lpb-dialog-') === 0) {
-      if (lpDialogInterval) {
-        clearInterval(lpDialogInterval);
-      }
-
       $dialog.data('lpOriginalHeight', $dialog.outerHeight());
-      lpDialogInterval = setInterval(repositionDialog.bind(null, $dialog), 500);
+      $dialog.data('lpDialogInterval', setInterval(repositionDialog.bind(null, $dialog), 500));
     }
   });
-  $(window).on('dialog:beforeclose', function () {
-    clearInterval(lpDialogInterval);
+  $(window).on('dialog:beforeclose', function (event, dialog, $dialog) {
+    clearInterval($dialog.data('lpDialogInterval'));
   });
-})(jQuery, Drupal, Drupal.debounce, dragula);
\ No newline at end of file
+})(jQuery, Drupal, Drupal.debounce, dragula);