diff --git a/app/DD-Record-Organiser/ClassControlBuilder.vb b/app/DD-Record-Organiser/ClassControlBuilder.vb
index cc96682..ba9e2b3 100644
--- a/app/DD-Record-Organiser/ClassControlBuilder.vb
+++ b/app/DD-Record-Organiser/ClassControlBuilder.vb
@@ -563,7 +563,6 @@ Public Class ClassControlBuilder
                 ' Use the Select method to find all rows matching the filter.
                 foundControls = CURRENT_DT_TBPMO_ENTITY_RIGHT_CONTROLS.Select(expression)
                 Dim i As Integer
-                Dim NODE_CONFIG_ID
                 ' Check if control is one of rightcontrols
                 For i = 0 To foundControls.GetUpperBound(0)
                     If foundControls(i)("CONTROL_ID") = CONTROL_ID Then
diff --git a/app/DD-Record-Organiser/ClassControlLoader.vb b/app/DD-Record-Organiser/ClassControlLoader.vb
index 3cb4cd2..f048167 100644
--- a/app/DD-Record-Organiser/ClassControlLoader.vb
+++ b/app/DD-Record-Organiser/ClassControlLoader.vb
@@ -454,7 +454,7 @@
                     End If
                 End While
             Next
-            If CtrlCommandUI.IsInsert Or CtrlCommandUI.IsEdit Then
+            If CtrlCommandUI.IsEdit Then
                 CURRENT_RECORD_ENABLED = True
             End If
 
diff --git a/app/DD-Record-Organiser/frmConstructor_Main.vb b/app/DD-Record-Organiser/frmConstructor_Main.vb
index 47419bc..fb2f2d5 100644
--- a/app/DD-Record-Organiser/frmConstructor_Main.vb
+++ b/app/DD-Record-Organiser/frmConstructor_Main.vb
@@ -828,6 +828,7 @@ Public Class frmConstructor_Main
         Else
             If CtrlCommandUI.IsInsert Then
                 ActivateAllTabs()
+                CtrlCommandUI.IsInsert = False
             End If
         End If
     End Sub
@@ -2322,12 +2323,7 @@ Public Class frmConstructor_Main
         Lock_RecordControls(True)
         RECORD_ENABLED = False
         CURRENT_RECORD_ENABLED = False
-        If Not IsNothing(CtrlCommandUI) Then
-            CtrlCommandUI.IsEdit = False
-            CtrlCommandUI.IsInsert = False
-        End If
-       
-
+        
         Me.tsButtonDelete.Enabled = False
         Me.tsButtonAdd.Enabled = True
         Me.tsButtonSave.Enabled = False
@@ -2343,11 +2339,17 @@ Public Class frmConstructor_Main
         If Not IsNothing(CtrlCommandUI) Then
             ActivateAllTabs()
         End If
-
-
         If RECORD_ENABLED = True Then
             ClassControlValues.UnloadControlValuesList(SELECTED_RECORD_ID, RECORD_ID, CtrlBuilder.AllControls)
         End If
+        If Not IsNothing(CtrlCommandUI) Then
+            'If CtrlCommandUI.IsInsert Then
+            '    CtrlCommandUI.IsInsert = False
+            'End If
+            If CtrlCommandUI.IsEdit Then
+                CtrlCommandUI.IsEdit = False
+            End If
+        End If
 
     End Sub
 
@@ -3081,6 +3083,7 @@ Public Class frmConstructor_Main
                 'End Try
 
             End If
+            CtrlCommandUI.IsEdit = False
             CtrlCommandUI.IsInsert = False
             RECORD_CHANGED = False
         End If