fix for #2311 and other issues in grid editors
Merge pull request #2398 from jpuri/mater_input

fix for #2311 and other issues in grid editors