diff --git a/webtools/bugzilla/template/en/default/admin/products/edit-common.html.tmpl b/webtools/bugzilla/template/en/default/admin/products/edit-common.html.tmpl
index ec6477287022..e3edadc9cd6e 100644
--- a/webtools/bugzilla/template/en/default/admin/products/edit-common.html.tmpl
+++ b/webtools/bugzilla/template/en/default/admin/products/edit-common.html.tmpl
@@ -53,8 +53,19 @@
   </tr>
   <tr>
     <th align="right">Default milestone:</th>
-    <td><input type="text" size="20" maxlength="20" name="defaultmilestone"
-              value="[% product.defaultmilestone FILTER html %]">
+    <td>
+      [% IF product.milestones.size %]
+        <select name="defaultmilestone">
+          [% FOREACH m = product.milestones %]
+            <option value="[% m.name FILTER html %]"
+                    [% " selected=\"selected\"" IF m.name == product.defaultmilestone %]>
+              [%- m.name FILTER html -%]</option>
+          [% END %]
+        </select>
+      [% ELSE %]
+        <input type="text" size="20" maxlength="20" name="defaultmilestone"
+               value="[% product.defaultmilestone FILTER html %]">
+      [% END %]
     </td>
   </tr>
 [% END %]