diff --git a/lib/downloads_fieldset.en.xml b/lib/downloads_fieldset.en.xml
index b13d1e95b37f724df3614690f5a7d8742dc0f9cd_bGliL2Rvd25sb2Fkc19maWVsZHNldC5lbi54bWw=..695b12b2d39a2c4bf99ee2fd84b87becbb9ad69f_bGliL2Rvd25sb2Fkc19maWVsZHNldC5lbi54bWw= 100644
--- a/lib/downloads_fieldset.en.xml
+++ b/lib/downloads_fieldset.en.xml
@@ -1,8 +1,8 @@
 <dropdowns>
-  <dropdown id="download_platform" label="Which operating system are you using?" aria="download_info">
+  <dropdown id="download_platform" label="Which operating system are you using?" aria="download_info" class="select-platform">
     <option value="win64" label="Windows x64" />
     <option value="win" label="Windows x86" />
     <option value="osx" label="macOS x64" />
     <option value="linux64" label="Linux x64" />
     <option value="linux" label="Linux x86" />
   </dropdown>
@@ -3,10 +3,10 @@
     <option value="win64" label="Windows x64" />
     <option value="win" label="Windows x86" />
     <option value="osx" label="macOS x64" />
     <option value="linux64" label="Linux x64" />
     <option value="linux" label="Linux x86" />
   </dropdown>
-  <dropdown id="download_language" label="Would you like to select a different language?" aria="download_info">
+  <dropdown id="download_language" label="Would you like to select a different language?" aria="download_info" class="select-language">
     <option value="zh-CN" label="Chinese (Simplified) — 中文 (简体)" />
     <option value="zh-TW" label="Chinese (Traditional) — 正體中文 (繁體)" />
     <option value="cs" label="Czech — Čeština" />
diff --git a/lib/release.tmpl b/lib/release.tmpl
index b13d1e95b37f724df3614690f5a7d8742dc0f9cd_bGliL3JlbGVhc2UudG1wbA==..695b12b2d39a2c4bf99ee2fd84b87becbb9ad69f_bGliL3JlbGVhc2UudG1wbA== 100644
--- a/lib/release.tmpl
+++ b/lib/release.tmpl
@@ -160,7 +160,8 @@
 
      "  <fieldset>\n";
      FOREACH dropdown IN dropdowns.dropdown;
-       "    <label for=\"$dropdown.id\" class=\"select-label\">$dropdown.label</label>\n";
-       "    <select id=\"$dropdown.id\" class=\"select-input\" aria-controls=\"$dropdown.aria\">\n";
+       "    <p class=\"$dropdown.class\">\n";
+       "      <label for=\"$dropdown.id\" class=\"select-label\">$dropdown.label</label>\n";
+       "      <select id=\"$dropdown.id\" class=\"select-input\" aria-controls=\"$dropdown.aria\">\n";
 
        FOREACH option IN dropdown.option;
@@ -165,5 +166,5 @@
 
        FOREACH option IN dropdown.option;
-         "      <option value=\"$option.value\">$option.label</option>\n";
+         "        <option value=\"$option.value\">$option.label</option>\n";
        END;
 
@@ -168,6 +169,7 @@
        END;
 
-       "    </select>\n";
+       "      </select>\n";
+       "    </p>\n";
      END;
 
      "  </fieldset>\n";