diff --git a/lib/galaxy/tools/parameters/basic.py b/lib/galaxy/tools/parameters/basic.py
index 5e1ed5bdf12..e75f8eb4c6a 100644
--- a/lib/galaxy/tools/parameters/basic.py
+++ b/lib/galaxy/tools/parameters/basic.py
@@ -474,14 +474,14 @@ class SelectToolParameter( ToolParameter ):
     blah
     >>> print p.get_html()
     <div class="checkUncheckAllPlaceholder" checkbox_name="blah"></div>
-    <div><input type="checkbox" name="blah" value="x">I am X</div>
-    <div class="odd_row"><input type="checkbox" name="blah" value="y" checked>I am Y</div>
-    <div><input type="checkbox" name="blah" value="z" checked>I am Z</div>
+    <div><input type="checkbox" name="blah" value="x" id="blah|x"><label for="blah|x">I am X</label></div>
+    <div class="odd_row"><input type="checkbox" name="blah" value="y" id="blah|y" checked='checked'><label for="blah|y">I am Y</label></div>
+    <div><input type="checkbox" name="blah" value="z" id="blah|z" checked='checked'><label for="blah|z">I am Z</label></div>
     >>> print p.get_html( value=["x","y"])
     <div class="checkUncheckAllPlaceholder" checkbox_name="blah"></div>
-    <div><input type="checkbox" name="blah" value="x" checked>I am X</div>
-    <div class="odd_row"><input type="checkbox" name="blah" value="y" checked>I am Y</div>
-    <div><input type="checkbox" name="blah" value="z">I am Z</div>
+    <div><input type="checkbox" name="blah" value="x" id="blah|x" checked='checked'><label for="blah|x">I am X</label></div>
+    <div class="odd_row"><input type="checkbox" name="blah" value="y" id="blah|y" checked='checked'><label for="blah|y">I am Y</label></div>
+    <div><input type="checkbox" name="blah" value="z" id="blah|z"><label for="blah|z">I am Z</label></div>
     >>> print p.to_param_dict_string( ["y", "z"] )
     y,z
     """
diff --git a/lib/galaxy/web/form_builder.py b/lib/galaxy/web/form_builder.py
index da791493afd..f27e5626f53 100644
--- a/lib/galaxy/web/form_builder.py
+++ b/lib/galaxy/web/form_builder.py
@@ -184,16 +184,16 @@ class SelectField(BaseField):
     >>> t.add_option( "tuti", 1 )
     >>> t.add_option( "fruity", "x" )
     >>> print t.get_html()
-    <div><input type="radio" name="foo" value="1">tuti</div>
-    <div><input type="radio" name="foo" value="x">fruity</div>
+    <div><input type="radio" name="foo" value="1" id="foo|1"><label for="foo|1">tuti</label></div>
+    <div><input type="radio" name="foo" value="x" id="foo|x"><label for="foo|x">fruity</label></div>
 
     >>> t = SelectField( "bar", multiple=True, display="checkboxes" )
     >>> t.add_option( "automatic", 3 )
     >>> t.add_option( "bazooty", 4, selected=True )
     >>> print t.get_html()
     <div class="checkUncheckAllPlaceholder" checkbox_name="bar"></div>
-    <div><input type="checkbox" name="bar" value="3">automatic</div>
-    <div><input type="checkbox" name="bar" value="4" checked>bazooty</div>
+    <div><input type="checkbox" name="bar" value="3" id="bar|3"><label for="bar|3">automatic</label></div>
+    <div><input type="checkbox" name="bar" value="4" id="bar|4" checked='checked'><label for="bar|4">bazooty</label></div>
     """
     def __init__( self, name, multiple=None, display=None, refresh_on_change=False, refresh_on_change_values=[], size=None ):
         self.name = name
@@ -232,13 +232,14 @@ class SelectField(BaseField):
         for text, value, selected in self.options:
             style = ""
             escaped_value = escape( str( value ), quote=True )
+            uniq_id = "%s%s|%s" % (prefix, self.name, escaped_value)
             if len(self.options) > 2 and ctr % 2 == 1:
                 style = " class=\"odd_row\""
             selected_text = ""
             if selected:
-                selected_text = "checked='checked'"
-            rval.append( '<div%s><input type="checkbox" name="%s%s" value="%s" id="%s" %s%s><label for="%s">%s</label></div>' % \
-                ( style, prefix, self.name, escaped_value, escaped_value, selected_text, self.get_disabled_str( disabled ), escaped_value, text ) )
+                selected_text = " checked='checked'"
+            rval.append( '<div%s><input type="checkbox" name="%s%s" value="%s" id="%s"%s%s><label for="%s">%s</label></div>' % \
+                ( style, prefix, self.name, escaped_value, uniq_id, selected_text, self.get_disabled_str( disabled ), uniq_id, text ) )
             ctr += 1
         return "\n".join( rval )
     def get_html_radio( self, prefix="", disabled=False ):
@@ -246,18 +247,23 @@ class SelectField(BaseField):
         ctr = 0
         for text, value, selected in self.options:
             style = ""
+            escaped_value = escape( str( value ), quote=True )
+            uniq_id = "%s%s|%s" % (prefix, self.name, escaped_value)
             if len(self.options) > 2 and ctr % 2 == 1:
                 style = " class=\"odd_row\""
-            if selected: selected_text = " checked"
-            else: selected_text = ""
-            rval.append( '<div%s><input type="radio" name="%s%s"%s value="%s"%s%s>%s</div>' % \
+            selected_text = ""
+            if selected:
+                selected_text = " checked='checked'"
+            rval.append( '<div%s><input type="radio" name="%s%s"%s value="%s" id="%s"%s%s><label for="%s">%s</label></div>' % \
                          ( style,
                            prefix,
                            self.name,
                            self.refresh_on_change_text,
-                           escape( str( value ), quote=True ),
+                           escaped_value,
+                           uniq_id,
                            selected_text,
                            self.get_disabled_str( disabled ),
+                           uniq_id,
                            text ) )
             ctr += 1
         return "\n".join( rval )