diff --git a/workflow/engine/xmlform/dynaforms/dynaforms_Properties.xml b/workflow/engine/xmlform/dynaforms/dynaforms_Properties.xml
index b6272e984..dba533eed 100755
--- a/workflow/engine/xmlform/dynaforms/dynaforms_Properties.xml
+++ b/workflow/engine/xmlform/dynaforms/dynaforms_Properties.xml
@@ -78,6 +78,12 @@
 // @param node element or node
 // @param tag tag of the class
 
+if(document.getElementById("form[DYN_TYPE]").value=="grid"){
+    hideRowById('WIDTH');
+    hideRowById('NEXTSTEPSAVE');
+    hideRowById('PRINTDYNAFORM');
+}
+
 function getElementsByClassNameCrossBrowser(searchClass,node,tag) {
 
        var classElements = new Array();
@@ -109,6 +115,9 @@ leimnud.event.add(getField('DYN_TYPE'), 'change', function() {
     validateGridConversion(proUid,dynUid);
   } else {
     changeToolbar("xmlform");
+    showRowById('WIDTH');
+    showRowById('NEXTSTEPSAVE');
+    showRowById('PRINTDYNAFORM');
   }
 });
 
@@ -131,18 +140,19 @@ function validateGridConversion(proUid,dynUid){
     oRPC.callback = function(oRPC) {
       var response = oRPC.xmlhttp.responseText;
       if (response=="ok"){
-         changeToolbar("grid");
-    
+          changeToolbar("grid");
+          hideRowById('WIDTH');
+          hideRowById('NEXTSTEPSAVE');
+          hideRowById('PRINTDYNAFORM');
       } else {
          setDropdownSelection("form[DYN_TYPE]" , "xmlform");
          msgBox("Grid forms can not contain the following fields: <br>" + response,"alert");
          return false;
-    
       }
     
 
     }.extend(this);
-    isTrue = oRPC.make();  
+    isTrue = oRPC.make();
     return isTrue;
 };