diff --git a/common/lib/capa/capa/templates/choicegroup.html b/common/lib/capa/capa/templates/choicegroup.html
index c7840cfd4e..758e2ffba1 100644
--- a/common/lib/capa/capa/templates/choicegroup.html
+++ b/common/lib/capa/capa/templates/choicegroup.html
@@ -32,8 +32,10 @@
             % endif
             >  
             <input type="${input_type}" name="input_${id}${name_array_suffix}" id="input_${id}_${choice_id}" value="${choice_id}"
-            % if choice_id == value:
+            % if input_type == 'radio' and choice_id == value:
             checked="true" 
+            % elif input_type != 'radio' and choice_id in value:
+            checked="true"
             % endif
 
             /> ${choice_description} </label>