diff --git a/deform/templates/checkbox_choice.pt b/deform/templates/checkbox_choice.pt
index c6667e18..0f3efaba 100644
--- a/deform/templates/checkbox_choice.pt
+++ b/deform/templates/checkbox_choice.pt
@@ -14,7 +14,7 @@
       <input tal:attributes="checked value in cstruct;
                              class css_class;
                              style style;
-                             autofocus not repeat.choice.index;
+                             autofocus not repeat.choice.index and autofocus;
                              attributes|field.widget.attributes|{};"
              type="checkbox"
              name="checkbox"
diff --git a/deform/templates/radio_choice.pt b/deform/templates/radio_choice.pt
index 9dd30b2d..811ed8f5 100644
--- a/deform/templates/radio_choice.pt
+++ b/deform/templates/radio_choice.pt
@@ -14,7 +14,7 @@
       <input tal:attributes="checked value == cstruct;
                              class css_class;
                              style style;
-                             autofocus not repeat.choice.index;
+                             autofocus not repeat.choice.index and autofocus;
                              attributes|field.widget.attributes|{};"
              type="radio"
              name="${oid}"