diff --git a/hobo/rails_generators/hobo_rapid/templates/hobo-rapid.js b/hobo/rails_generators/hobo_rapid/templates/hobo-rapid.js
index 146c8b97b..d3cd04ddf 100755
--- a/hobo/rails_generators/hobo_rapid/templates/hobo-rapid.js
+++ b/hobo/rails_generators/hobo_rapid/templates/hobo-rapid.js
@@ -655,10 +655,8 @@ SelectManyInput = Behavior.create({
             this.element.down('.items').appendChild(newItem);
             newItem.down('span').innerHTML = selected.innerHTML
             this.itemAdded(newItem, selected)
-            selected.disabled = true
-            selected.addClassName("hidden")
-            optgroup = select.down("optgroup[label="+selected.text+"]")
-            optgroup.removeClassName("hidden")
+            var optgroup = new Element("optgroup", {class:"disabled-option", alt:selected.value, label:selected.text})
+            selected.replace(optgroup)
             select.value = ""
             Event.addBehavior.reload()
             this.element.fire("rapid:add", { element: newItem })
@@ -681,11 +679,10 @@ SelectManyInput = Behavior.create({
                                  element.fire("rapid:change", { element: el })
                                  } } ) 
         var label = el.down('span').innerHTML
-        var option = $A(element.getElementsByTagName('option')).find(function(o) { return o.innerHTML == label })
-        option.disabled = false
-        option.removeClassName("hidden")
-        optgroup = element.down("optgroup[label="+label+"]")
-        optgroup.addClassName("hidden")    
+        var optgroup = element.down("optgroup[label="+label+"]")
+        var option = new Element("option", {value:optgroup.readAttribute("alt")})
+        option.innerHTML = optgroup.readAttribute("label")
+        optgroup.replace(option)
     },
 
     itemAdded: function(item, option) {
diff --git a/hobo/taglibs/rapid_forms.dryml b/hobo/taglibs/rapid_forms.dryml
index 40764c652..ba9bc1697 100644
--- a/hobo/taglibs/rapid_forms.dryml
+++ b/hobo/taglibs/rapid_forms.dryml
@@ -772,11 +772,9 @@ To use this tag, the model of the items the user is chosing *must* have unique n
       <option value=""><prompt/></option>
       <repeat with="&options">
         <if test="&this.in?(values)">
-          <optgroup class="disabled-option" label="#{h this.to_s}">&nbsp;</optgroup>
-          <option value="@#{this.id}" class="hidden" disabled><%= h this.to_s%></option>
+          <optgroup class="disabled-option" label="#{h this.to_s}" alt="@#{this.id}">&nbsp;</optgroup>
         </if>
         <else>
-          <optgroup class="disabled-option hidden" label="#{h this.to_s}">&nbsp;</optgroup>
           <option value="@#{this.id}"><%= h this.to_s %></option>
         </else>
       </repeat>