diff --git a/lib/WebGUI/Form/CheckList.pm b/lib/WebGUI/Form/CheckList.pm
index 7500e8ccd..b1435bf77 100644
--- a/lib/WebGUI/Form/CheckList.pm
+++ b/lib/WebGUI/Form/CheckList.pm
@@ -119,6 +119,13 @@ Renders a series of checkboxes.
 sub toHtml {
 	my $self = shift;
 	my $output;
+	my $alignment;
+	if ($self->{vertical}) {
+		$alignment = "<br />\n";
+	}
+	else {
+		$alignment = " &nbsp; &nbsp;\n";
+	}
 	foreach my $key (keys %{$self->{options}}) {
                 my $checked = 0;
                 foreach my $item (@{$self->{value}}) {
@@ -132,12 +139,7 @@ sub toHtml {
                         extras=>$self->{extras},
                         checked=>$checked
                         })->toHtml;
-                $output .= ${$self->{options}}{$key};
-                if ($self->{vertical}) {
-                        $output .= "<br />\n";
-                } else {
-                        $output .= " &nbsp; &nbsp;\n";
-                }
+                $output .= ${$self->{options}}{$key} . $alignment;
         }
         return $output;
 }
diff --git a/lib/WebGUI/Form/RadioList.pm b/lib/WebGUI/Form/RadioList.pm
index 7b2e813f2..1262bb1c0 100644
--- a/lib/WebGUI/Form/RadioList.pm
+++ b/lib/WebGUI/Form/RadioList.pm
@@ -97,6 +97,13 @@ Renders a series of radio buttons.
 sub toHtml {
 	my $self = shift;
 	my $output;
+	my $alignment;
+	if ($self->{vertical}) {
+		$alignment = "<br />\n";
+	}
+	else {
+		$alignment = " &nbsp; &nbsp;\n";
+	}
 	foreach my $key (keys %{$self->{options}}) {
                 my $checked = 0;
                 if ($self->{value} eq $key) {
@@ -108,12 +115,7 @@ sub toHtml {
                         extras=>$self->{extras},
                         checked=>$checked
                         })->toHtml;
-                $output .= ${$self->{options}}{$key};
-                if ($self->{vertical}) {
-                        $output .= "<br />\n";
-                } else {
-                        $output .= " &nbsp; &nbsp;\n";
-                }
+                $output .= ${$self->{options}}{$key} . $alignment;
         }
         return $output;
 }