diff --git a/app/DD-Record-Organizer/frmNodeNavigation.vb b/app/DD-Record-Organizer/frmNodeNavigation.vb
index ea7f568..b62c49e 100644
--- a/app/DD-Record-Organizer/frmNodeNavigation.vb
+++ b/app/DD-Record-Organizer/frmNodeNavigation.vb
@@ -308,7 +308,7 @@ Public Class frmNodeNavigation
 
         btnCreateNewNode.Enabled = False
 
-        If _FilterActive Then
+        If RIGHT_RECORD_AND_FILE_READ_ONLY = True Then
             Exit Sub
         End If
 
@@ -416,10 +416,11 @@ Public Class frmNodeNavigation
                 If RIGHT_RECORD_AND_FILE_READ_ONLY = True Then
                     bbtnitmRecEdit.Enabled = False
                     bbtnitmRecSave.Enabled = False
+                    btnCreateNewNode.Enabled = False
                 Else
                     bbtnitmRecEdit.Enabled = True
                     In_Visible_Record_Group(True)
-
+                    btnCreateNewNode.Enabled = True
                 End If
 
             End If