diff --git a/lib/templates/form_autocomplete_selection.mustache b/lib/templates/form_autocomplete_selection.mustache
index 0476f279ce4..04f1c54cef9 100644
--- a/lib/templates/form_autocomplete_selection.mustache
+++ b/lib/templates/form_autocomplete_selection.mustache
@@ -44,6 +44,7 @@
     }} aria-labelledby="{{selectionId}}-label"{{!
     }} role="listbox"{{!
     }} aria-atomic="true"{{!
-    }} {{#multiple}}tabindex="0" aria-multiselectable="true"{{/multiple}}>
+    }} tabindex="0"{{!
+    }} {{#multiple}}aria-multiselectable="true"{{/multiple}}>
     {{> core/form_autocomplete_selection_items }}
 </div>
diff --git a/user/templates/local/participantsfilter/autocomplete_selection.mustache b/user/templates/local/participantsfilter/autocomplete_selection.mustache
index 57327a82aec..c365c33e892 100644
--- a/user/templates/local/participantsfilter/autocomplete_selection.mustache
+++ b/user/templates/local/participantsfilter/autocomplete_selection.mustache
@@ -44,7 +44,8 @@
     }} aria-labelledby="{{selectionId}}-label"{{!
     }} role="listbox"{{!
     }} aria-atomic="true"{{!
-    }}{{#multiple}} tabindex="0" aria-multiselectable="true"{{/multiple}}{{!
+    }} tabindex="0"{{!
+    }}{{#multiple}} aria-multiselectable="true"{{/multiple}}{{!
     }}>
     {{> core/form_autocomplete_selection_items }}
 </div>