diff --git a/lib/functions/output/function.makecheckbox.php b/lib/functions/output/function.makecheckbox.php
index f58f59b9..c8f38887 100644
--- a/lib/functions/output/function.makecheckbox.php
+++ b/lib/functions/output/function.makecheckbox.php
@@ -57,7 +57,7 @@ function makecheckbox($name, $title, $value, $break = false, $selvalue = NULL, $
 		$value = htmlspecialchars($value);
 	}
 
-	$checkbox = '<input type="checkbox" name="' . $name . '" value="' . $value . '" ' . $checked . ' />&nbsp;' . $title;
+	$checkbox = '<label class="nobr"><input type="checkbox" name="' . $name . '" value="' . $value . '" ' . $checked . ' />&nbsp;' . $title . '</label>';
 
 	if($break)
 	{
diff --git a/templates/Froxlor/froxlor.css b/templates/Froxlor/froxlor.css
index afaf1e5c..fbd2a5f0 100644
--- a/templates/Froxlor/froxlor.css
+++ b/templates/Froxlor/froxlor.css
@@ -731,3 +731,7 @@ select {
 .strikethrough {
 	text-decoration: line-through;
 }
+
+label.nobr {
+        display: inline;
+}