diff --git a/gulliver/system/class.xmlform.php b/gulliver/system/class.xmlform.php
index 7f182bb05..0c2dc5c45 100644
--- a/gulliver/system/class.xmlform.php
+++ b/gulliver/system/class.xmlform.php
@@ -3314,7 +3314,6 @@ class XmlForm_Field_Date extends XmlForm_Field_SimpleText
         } else {
           $id   = 'form[' . $owner->name . '][' . $r . '][' . $this->name . ']';
           $html = $this->__draw_widget ( $id, $v, $owner );
-          $html = '<div style="white-space:nowrap;">' . $html . '</div>';
         }
       } else {
         $html = $v;
diff --git a/workflow/engine/templates/grid.html b/workflow/engine/templates/grid.html
index 2a5e70c1f..cc2521e93 100644
--- a/workflow/engine/templates/grid.html
+++ b/workflow/engine/templates/grid.html
@@ -35,7 +35,7 @@
       <td class='GridLabel'> {$smarty.section.row.index+1} </td>
 {/literal}
 {foreach from=$form->fields item=field}
-      <td style="">{$field->field}</td>
+      <td style="white-space:nowrap;">{$field->field}</td>
 {/foreach}
 {if $form->deleteRow == '1' }
       <td align="center"><A class="GridLink" href="#" onclick="form_{$form->owner->id}.getElementByName('{$form->name}').deleteGridRow('[{literal}{$smarty.section.row.index+1}{/literal}]');return false;">{$form->DeleteLabel}</A>&nbsp;</td>