diff --git a/blocks/loops.ts b/blocks/loops.ts
index 50e4fcff96f..c7cb710d770 100644
--- a/blocks/loops.ts
+++ b/blocks/loops.ts
@@ -20,6 +20,7 @@ import {
   createBlockDefinitionsFromJsonArray,
   defineBlocks,
 } from '../core/common.js';
+import * as eventUtils from '../core/events/utils.js';
 import '../core/field_dropdown.js';
 import '../core/field_label.js';
 import '../core/field_number.js';
@@ -381,15 +382,19 @@ const CONTROL_FLOW_IN_LOOP_CHECK_MIXIN = {
     this.setWarningText(
       enabled ? null : Msg['CONTROLS_FLOW_STATEMENTS_WARNING'],
     );
+
     if (!this.isInFlyout) {
-      const group = Events.getGroup();
-      // Makes it so the move and the disable event get undone together.
-      Events.setGroup(e.group);
-      this.setDisabledReason(
-        !enabled,
-        CONTROL_FLOW_NOT_IN_LOOP_DISABLED_REASON,
-      );
-      Events.setGroup(group);
+      try {
+        // There is no need to record the enable/disable change on the undo/redo
+        // list since the change will be automatically recreated when replayed.
+        eventUtils.setRecordUndo(false);
+        this.setDisabledReason(
+          !enabled,
+          CONTROL_FLOW_NOT_IN_LOOP_DISABLED_REASON,
+        );
+      } finally {
+        eventUtils.setRecordUndo(true);
+      }
     }
   },
 };
diff --git a/blocks/procedures.ts b/blocks/procedures.ts
index 32139264429..1214eb55eda 100644
--- a/blocks/procedures.ts
+++ b/blocks/procedures.ts
@@ -25,6 +25,7 @@ import type {
   ContextMenuOption,
   LegacyContextMenuOption,
 } from '../core/contextmenu_registry.js';
+import * as eventUtils from '../core/events/utils.js';
 import {FieldCheckbox} from '../core/field_checkbox.js';
 import {FieldLabel} from '../core/field_label.js';
 import {FieldTextInput} from '../core/field_textinput.js';
@@ -1329,12 +1330,16 @@ const PROCEDURES_IFRETURN = {
     } else {
       this.setWarningText(Msg['PROCEDURES_IFRETURN_WARNING']);
     }
+
     if (!this.isInFlyout) {
-      const group = Events.getGroup();
-      // Makes it so the move and the disable event get undone together.
-      Events.setGroup(e.group);
-      this.setDisabledReason(!legal, UNPARENTED_IFRETURN_DISABLED_REASON);
-      Events.setGroup(group);
+      try {
+        // There is no need to record the enable/disable change on the undo/redo
+        // list since the change will be automatically recreated when replayed.
+        eventUtils.setRecordUndo(false);
+        this.setDisabledReason(!legal, UNPARENTED_IFRETURN_DISABLED_REASON);
+      } finally {
+        eventUtils.setRecordUndo(true);
+      }
     }
   },
   /**