diff --git a/TuxGuitar-ui-toolkit-swt/src/org/herac/tuxguitar/ui/swt/widget/SWTCheckBox.java b/TuxGuitar-ui-toolkit-swt/src/org/herac/tuxguitar/ui/swt/widget/SWTCheckBox.java
index 4c7c384dd..07f01ac7d 100644
--- a/TuxGuitar-ui-toolkit-swt/src/org/herac/tuxguitar/ui/swt/widget/SWTCheckBox.java
+++ b/TuxGuitar-ui-toolkit-swt/src/org/herac/tuxguitar/ui/swt/widget/SWTCheckBox.java
@@ -16,7 +16,7 @@ public class SWTCheckBox extends SWTControl<Button> implements UICheckBox {
 	private UIImage image;
 	
 	public SWTCheckBox(SWTContainer<? extends Composite> parent) {
-		super(new Button(parent.getControl(), SWT.CHECK), parent);
+		super(new Button(parent.getControl(), SWT.CHECK | SWT.WRAP), parent);
 		
 		this.selectionListener = new SWTSelectionListenerManager(this);
 	}
diff --git a/TuxGuitar-ui-toolkit-swt/src/org/herac/tuxguitar/ui/swt/widget/SWTRadioButton.java b/TuxGuitar-ui-toolkit-swt/src/org/herac/tuxguitar/ui/swt/widget/SWTRadioButton.java
index f805c1296..3e9f85fb5 100644
--- a/TuxGuitar-ui-toolkit-swt/src/org/herac/tuxguitar/ui/swt/widget/SWTRadioButton.java
+++ b/TuxGuitar-ui-toolkit-swt/src/org/herac/tuxguitar/ui/swt/widget/SWTRadioButton.java
@@ -16,7 +16,7 @@ public class SWTRadioButton extends SWTControl<Button> implements UIRadioButton
 	private UIImage image;
 	
 	public SWTRadioButton(SWTContainer<? extends Composite> parent) {
-		super(new Button(parent.getControl(), SWT.RADIO), parent);
+		super(new Button(parent.getControl(), SWT.RADIO | SWT.WRAP), parent);
 		
 		this.selectionListener = new SWTSelectionListenerManager(this);
 	}