diff --git a/src/Symfony/Bridge/Twig/Resources/views/Form/form_div_layout.html.twig b/src/Symfony/Bridge/Twig/Resources/views/Form/form_div_layout.html.twig
index d2e70b800e890..03af6a845a412 100644
--- a/src/Symfony/Bridge/Twig/Resources/views/Form/form_div_layout.html.twig
+++ b/src/Symfony/Bridge/Twig/Resources/views/Form/form_div_layout.html.twig
@@ -57,7 +57,9 @@
{% if preferred_choices|length > 0 %}
{% set options = preferred_choices %}
{{ block('widget_choice_options') }}
-
+ {% if choices|length > 0 %}
+
+ {% endif %}
{% endif %}
{% set options = choices %}
{{ block('widget_choice_options') }}
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/choice_widget.html.php b/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/choice_widget.html.php
index 70e210491e986..79ec1be39f0aa 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/choice_widget.html.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/choice_widget.html.php
@@ -13,7 +13,9 @@
0): ?>
renderBlock('choice_options', array('options' => $preferred_choices)) ?>
-
+ 0): ?>
+
+
renderBlock('choice_options', array('options' => $choices)) ?>