diff --git a/src/main/resources/org/biouno/unochoice/common/choiceParameterCommon.jelly b/src/main/resources/org/biouno/unochoice/common/choiceParameterCommon.jelly
index 324f733f..95974a18 100644
--- a/src/main/resources/org/biouno/unochoice/common/choiceParameterCommon.jelly
+++ b/src/main/resources/org/biouno/unochoice/common/choiceParameterCommon.jelly
@@ -22,17 +22,8 @@
           <select name="value" multiple="multiple" size="1" id="${multiple_select_id}">
             <st:include page="/org/biouno/unochoice/common/selectContent.jelly"/>
           </select>
-          <script type="text/javascript">
-            <![CDATA[
-              (function() {
-                  var f = function() {
-                      var size = ${it.visibleItemCount};
-                      document.getElementById("${multiple_select_id}").size = size;
-                  };
-                  f();
-              })();
-            ]]>
-          </script>
+          <span class="multi-select-data-holder" data-visible-item-count="${it.visibleItemCount}" data-multi-select-id="${multiple_select_id}"/>
+          <st:adjunct includes="org.biouno.unochoice.common.multi-select"/>
         </j:when>
         <j:when test="${choiceType eq 'PT_RADIO'}">
           <st:include page="/org/biouno/unochoice/common/radioContent.jelly"/>
@@ -49,4 +40,4 @@
       </j:if>
     </div>
   </f:entry>
-</j:jelly>
\ No newline at end of file
+</j:jelly>
diff --git a/src/main/resources/org/biouno/unochoice/common/multi-select.js b/src/main/resources/org/biouno/unochoice/common/multi-select.js
new file mode 100644
index 00000000..6a3d4e21
--- /dev/null
+++ b/src/main/resources/org/biouno/unochoice/common/multi-select.js
@@ -0,0 +1,6 @@
+window.addEventListener("DOMContentLoaded", () => {
+    document.querySelectorAll(".multi-select-data-holder").forEach((dataHolder) => {
+        const { visibleItemCount, multiSelectId } = dataHolder.dataset;
+        document.getElementById(multiSelectId).size = visibleItemCount;
+    });
+});