diff --git a/layout_builder_save_and_edit.module b/layout_builder_save_and_edit.module
index 4874bd5..690d2d2 100644
--- a/layout_builder_save_and_edit.module
+++ b/layout_builder_save_and_edit.module
@@ -62,7 +62,8 @@ function layout_builder_save_and_edit_form_alter(&$form, FormStateInterface $for
  */
 function layout_builder_save_and_edit_layout_submit_handler(array &$form, FormStateInterface $form_state) {
   $trigger = $form_state->getTriggeringElement();
-  if (isset($trigger['#id']) && $trigger['#id'] == 'edit-layout-builder-save-and-edit-layout') {
+  if (isset($trigger['#attributes']['data-drupal-selector'])
+    && $trigger['#attributes']['data-drupal-selector'] == 'edit-layout-builder-save-and-edit-layout') {
     $form_state->setRedirectUrl($trigger['#redirect_url']);
   }
 }