diff --git a/gulliver/system/class.form.php b/gulliver/system/class.form.php
index 1d27ed675..599404250 100755
--- a/gulliver/system/class.form.php
+++ b/gulliver/system/class.form.php
@@ -47,6 +47,7 @@ class Form extends XmlForm
   var $objectRequiredFields = null;
   var $nextstepsave = '';
   var $printdynaform = '';
+  var $adjustgridswith = '0';
 
   public $visual_frontend;
 
diff --git a/gulliver/system/class.xmlform.php b/gulliver/system/class.xmlform.php
index 703f5fb88..f173bbdf1 100755
--- a/gulliver/system/class.xmlform.php
+++ b/gulliver/system/class.xmlform.php
@@ -3295,8 +3295,34 @@ class XmlForm_Field_Grid extends XmlForm_Field
       $fieldsSize +=  $size;
       $emptyRow [$key] = array ($emptyValue);
     }
-    if($fieldsSize>100)
-      $owner->width = '100%';
+    
+    if (isset($owner->adjustgridswith) && $owner->adjustgridswith == '1') {
+      // 400w -> 34s to Firefox
+      // 400w -> 43s to Chrome
+      
+      $baseWidth = 400;
+      $minusWidth = 30;
+      if (eregi('chrome', $_SERVER['HTTP_USER_AGENT'])) {
+        $baseSize  = 43;
+      } else {
+        if (strpos($_SERVER['HTTP_USER_AGENT'], 'MSIE') !== false) {
+          $minusWidth = 20;
+        }
+        $baseSize  = 34;
+      }
+
+      $baseWidth = 400;
+      $formWidth = (int)$owner->width;
+      $maxSize = (($formWidth*$baseSize) / $baseWidth);
+
+      if ($fieldsSize > $maxSize) {
+        $this->scrollStyle = 'height:100%; overflow-x: scroll; width:';
+        $this->scrollStyle .= $formWidth - $minusWidth . ';';
+      }
+    } else {
+      if($fieldsSize>100)
+        $owner->width = '100%';  
+    }
   //  else
   //    $owner->width = $fieldsSize . 'em';
     return $this->renderGrid ( $emptyRow, $owner );
diff --git a/workflow/engine/classes/class.dynaformEditor.php b/workflow/engine/classes/class.dynaformEditor.php
index 6040d03f5..fd8017a5b 100755
--- a/workflow/engine/classes/class.dynaformEditor.php
+++ b/workflow/engine/classes/class.dynaformEditor.php
@@ -716,6 +716,7 @@ class dynaformEditorAjax extends dynaformEditor implements iDynaformEditorAjax
                           //'ENABLETEMPLATE'=> $form->enableTemplate,
                           'MODE'           => $form->mode,
                           'PRINTDYNAFORM'  => $form->printdynaform,
+                          'ADJUSTGRIDSWITH'=> $form->adjustgridswith,
                           'NEXTSTEPSAVE'   => $form->nextstepsave
                          );
       $tmp['Properties']=$Properties;
@@ -776,6 +777,9 @@ class dynaformEditorAjax extends dynaformEditor implements iDynaformEditorAjax
       if (isset($Fields['PRINTDYNAFORM'])) {
         $ses2->execute(G::replaceDataField("UPDATE . SET PRINTDYNAFORM = @@PRINTDYNAFORM WHERE XMLNODE_NAME = 'dynaForm' ", $Fields));
       }
+      if (isset($Fields['ADJUSTGRIDSWITH'])) {
+        $ses2->execute(G::replaceDataField("UPDATE . SET ADJUSTGRIDSWITH = @@ADJUSTGRIDSWITH WHERE XMLNODE_NAME = 'dynaForm' ", $Fields));
+      }
       return 0;
     }
     catch(Exception $e) {
diff --git a/workflow/engine/templates/grid.html b/workflow/engine/templates/grid.html
index 758a4f215..d0656c506 100755
--- a/workflow/engine/templates/grid.html
+++ b/workflow/engine/templates/grid.html
@@ -2,18 +2,19 @@
 {* this is the grid template *}
 <div class="grid">
 	<div class="boxTop"><div class="a"></div><div class="b"></div><div class="c"></div></div>
-	<div class="content">
+	<div class="content" style="{$form->scrollStyle};">
 <table class="" width="100%" cellpadding="0" cellspacing="0">
  <tr>
   <th>{$form->label}</th>
  </tr>
 </table>
+
 <table class="tableGrid" align="center" id="form[{$form->name}]" cellpadding="0" cellspacing="0">
   <tr><td valign='top'>
 {if ($form->addRow) }
    <table class='Record'>
      <tr><td></td>
-      <td><img id="form[{$form->name}][bullet]" src="/images/bulletButton.gif" />&nbsp;<a id="form[{$form->name}][addLink]" class="GridLink" href="javascript:;" value="Insert" onclick="form_{$form->owner->id}.getElementByName('{$form->name}').addGridRow(); return false;">{$form->NewLabel}</a></td>
+      <td>                               <img id="form[{$form->name}][bullet]" src="/images/bulletButton.gif" />&nbsp;<a id="form[{$form->name}][addLink]" class="GridLink" href="javascript:;" value="Insert" onclick="form_{$form->owner->id}.getElementByName('{$form->name}').addGridRow(); return false;">{$form->NewLabel}</a></td>
      </tr>
    </table>
 {/if}
@@ -66,6 +67,7 @@
    </table>
   </td></tr>
 </table>
+
 	</div>
 	<div class="boxBottom"><div class="a"></div><div class="b"></div><div class="c"></div></div>
 </div>
diff --git a/workflow/engine/xmlform/dynaforms/dynaforms_Properties.xml b/workflow/engine/xmlform/dynaforms/dynaforms_Properties.xml
index 5001bab07..955c200c2 100755
--- a/workflow/engine/xmlform/dynaforms/dynaforms_Properties.xml
+++ b/workflow/engine/xmlform/dynaforms/dynaforms_Properties.xml
@@ -53,11 +53,15 @@
   <option name="prompt">Show prompt</option>
   </en>
 </NEXTSTEPSAVE>
-
+ 
 <PRINTDYNAFORM type="checkbox" falseValue="0" value="1" defaultvalue="0" labelOnRight="0">
 <en>Show print dynaform button</en>
 </PRINTDYNAFORM>
 
+<ADJUSTGRIDSWITH type="checkbox" falseValue="0" value="0" defaultvalue="0" labelOnRight="0">
+  <en>Adjust the grid width to the width of the main form</en>
+</ADJUSTGRIDSWITH>
+
 <!--<ENABLETEMPLATE type="checkbox" value="1" defaultvalue="0" labelOnRight="0">
   <en>Enable Template</en>
 </ENABLETEMPLATE>-->
@@ -83,6 +87,7 @@ if(document.getElementById("form[DYN_TYPE]").value=="grid"){
     hideRowById('WIDTH');
     hideRowById('NEXTSTEPSAVE');
     hideRowById('PRINTDYNAFORM');
+    hideRowById('ADJUSTGRIDSWITH');
 }
 
 function getElementsByClassNameCrossBrowser(searchClass,node,tag) {
@@ -145,6 +150,7 @@ function validateGridConversion(proUid,dynUid){
           hideRowById('WIDTH');
           hideRowById('NEXTSTEPSAVE');
           hideRowById('PRINTDYNAFORM');
+          hideRowById('ADJUSTGRIDSWITH');
       } else {
          setDropdownSelection("form[DYN_TYPE]" , "xmlform");
          msgBox("Grid forms can not contain the following fields: <br>" + response,"alert");