diff --git a/components/number.inc b/components/number.inc
index 341a4dd..40a7d63 100644
--- a/components/number.inc
+++ b/components/number.inc
@@ -330,7 +330,8 @@ function _webform_display_number($component, $value, $format = 'html') {
     '#title' => $component['name'],
     '#weight' => $component['weight'],
     '#theme' => 'webform_display_number',
-    '#theme_wrappers' => $format == 'html' ? array('webform_element') : array('webform_element_text'),
+    '#theme_wrappers' => $format == 'html' ? array('webform_element', 'webform_element_wrapper') : array('webform_element_text'),
+    '#post_render' => array('webform_element_wrapper'),
     '#field_prefix' => $empty ? '' : $component['extra']['field_prefix'],
     '#field_suffix' => $empty ? '' : $component['extra']['field_suffix'],
     '#format' => $format,