diff --git a/designer_v2/lib/common_views/form_table_layout.dart b/designer_v2/lib/common_views/form_table_layout.dart
index 0faab7166..9a9274ddc 100644
--- a/designer_v2/lib/common_views/form_table_layout.dart
+++ b/designer_v2/lib/common_views/form_table_layout.dart
@@ -214,14 +214,22 @@ class FormSectionHeader extends StatelessWidget {
             else
               const SizedBox.shrink(),
             if (showLock)
-              Row(children: [
-                ReactiveFormLock(
-                  formControl: lockControl,
-                  helpText: lockHelpText,
-                  lockedStateText: lockedStateText,
-                  unlockedStateText: unlockedStateText,
-                )
-              ])
+              Row(
+                children: [
+                  FormLock(
+                    locked: lockControl?.value ?? false,
+                    readOnly: lockControl?.disabled ?? false,
+                    onLockChanged: lockControl!.enabled
+                        ? (value) {
+                            lockControl?.value = value;
+                          }
+                        : null,
+                    helpText: lockHelpText,
+                    lockedStateText: lockedStateText,
+                    unlockedStateText: unlockedStateText,
+                  )
+                ],
+              )
             else
               const SizedBox.shrink(),
           ],