diff --git a/doc/ChangeLog b/doc/ChangeLog
index 5dc871a39..d2c3c8af3 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,5 +1,8 @@
 2011-03-08  vadim  <vadim@netcitadel.com>
 
+	* GroupObjectDialog.cpp (loadFWObject): fixes #2203 "Crash when
+	attempting to add an object to a locked group".
+
 	* PolicyCompiler.cpp (checkForShadowing): see #2204 "Shadowing
 	detected for rule with action Continue". Policy rules with action
 	"Continue" should not shadow other rules and can not be shadowed.
diff --git a/src/libgui/GroupObjectDialog.cpp b/src/libgui/GroupObjectDialog.cpp
index 4fd7cf065..4465ded17 100644
--- a/src/libgui/GroupObjectDialog.cpp
+++ b/src/libgui/GroupObjectDialog.cpp
@@ -465,6 +465,8 @@ void GroupObjectDialog::loadFWObject(FWObject *o)
     m_dialog->comment->setEnabled(!o->isReadOnly() && !FWBTree().isSystem(o));
     setDisabledPalette(m_dialog->comment);
 
+    m_dialog->newButton->setEnabled(!o->isReadOnly());
+
 //    listView->setEnabled(!o->isReadOnly());
     setDisabledPalette(listView);