diff --git a/modules/poll.module b/modules/poll.module
index 2918e8679f3..2597a249833 100644
--- a/modules/poll.module
+++ b/modules/poll.module
@@ -180,7 +180,7 @@ function poll_form($edit = array(), $nocheck = 0) {
   if ($admin && !is_array($edit[choices])) $edit = poll_get_choices_array($edit);
 
   /* Mini-form for number of choiceboxes */
-  $choices = $edit[choices] ? $edit[choices] : max(5, count($edit[choice]));
+  $choices = $edit[choices] ? $edit[choices] : max(2, count($edit[choice]));
   for ($c = 2; $c <= 20; $c++) $opts[$c]=$c;
   $form .= form_select(t("Number of choices"), "choices", $choices, $opts, t("This box only specifies the number of boxes in this form, it doesn't have to equal the actual amount of choices in the poll."));
   $form .= form_submit(t("Preview")) . "<br><br><br>";
diff --git a/modules/poll/poll.module b/modules/poll/poll.module
index 2918e8679f3..2597a249833 100644
--- a/modules/poll/poll.module
+++ b/modules/poll/poll.module
@@ -180,7 +180,7 @@ function poll_form($edit = array(), $nocheck = 0) {
   if ($admin && !is_array($edit[choices])) $edit = poll_get_choices_array($edit);
 
   /* Mini-form for number of choiceboxes */
-  $choices = $edit[choices] ? $edit[choices] : max(5, count($edit[choice]));
+  $choices = $edit[choices] ? $edit[choices] : max(2, count($edit[choice]));
   for ($c = 2; $c <= 20; $c++) $opts[$c]=$c;
   $form .= form_select(t("Number of choices"), "choices", $choices, $opts, t("This box only specifies the number of boxes in this form, it doesn't have to equal the actual amount of choices in the poll."));
   $form .= form_submit(t("Preview")) . "<br><br><br>";