diff --git a/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/model/BCheckbox.java b/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/model/BCheckbox.java
index d6984cb85849810f7ae44ef5ebc48d3c7e883d40..5732a48b79e6e32844eae9e184e35a5e0dbd065e 100644
--- a/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/model/BCheckbox.java
+++ b/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/model/BCheckbox.java
@@ -62,5 +62,16 @@ public class BCheckbox extends BControl {
 					.toString();
 		}
 	}
+	
+	@Override
+	public void executeEvent(String eventID) {
+		if (Boolean.valueOf(getAttributeValue(
+				AttributeConstants.ATTRIBUTE_CHECKED).toString())) {
+			setAttributeValue(AttributeConstants.ATTRIBUTE_CHECKED, false);
+		} else {
+			setAttributeValue(AttributeConstants.ATTRIBUTE_CHECKED, true);
+		}
+		super.executeEvent(eventID);
+	}
 
 }
diff --git a/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/model/BRadioButton.java b/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/model/BRadioButton.java
index a05d99e1161b2e256d6e214ab911cd01dbb3a40f..8a62d839dd1a82b836e21abf36df5869ccbd318f 100644
--- a/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/model/BRadioButton.java
+++ b/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/model/BRadioButton.java
@@ -79,5 +79,20 @@ public class BRadioButton extends BControl {
 		}
 		return "";
 	}
+	
+	@Override
+	public void executeEvent(String eventID) {
+		String btgroupid = getAttributeValue(
+				AttributeConstants.ATTRIBUTE_BUTTONGROUP).toString();
+		if (!btgroupid.trim().equals("")) {
+			Collection<BControl> btGroup = ButtonGroupHelper
+					.getButtonGroup(btgroupid);
+			for (BControl control : btGroup) {
+					control.setAttributeValue(AttributeConstants.ATTRIBUTE_CHECKED, false);					
+			}
+		}
+		setAttributeValue(AttributeConstants.ATTRIBUTE_CHECKED, true);
+		super.executeEvent(eventID);
+	}
 
 }
diff --git a/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/part/BRadioButtonPart.java b/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/part/BRadioButtonPart.java
index f4ad340be62284ad1c6ce9d3a390393c3160e08a..f7c7dc2d633541aa2586f4298a625594b845831f 100644
--- a/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/part/BRadioButtonPart.java
+++ b/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/part/BRadioButtonPart.java
@@ -133,6 +133,9 @@ public class BRadioButtonPart extends AppAbstractEditPart {
 						(BControl) getModel());
 			}
 		}
+		
+		if (aID.equals(AttributeConstants.ATTRIBUTE_ENABLED))
+			((RadioButtonFigure) figure).setBtEnabled(Boolean.valueOf(value.toString()));
 
 		if (aID.equals(AttributeConstants.ATTRIBUTE_ENABLED))
 			((RadioButtonFigure) figure).setBtEnabled(Boolean.valueOf(value