diff --git a/frappe/core/doctype/file/file.py b/frappe/core/doctype/file/file.py
index 415ba5ab5e..9dc75f06d9 100755
--- a/frappe/core/doctype/file/file.py
+++ b/frappe/core/doctype/file/file.py
@@ -76,7 +76,7 @@ class File(NestedSet):
 		"""Set folder size if folder"""
 		if self.is_folder and not self.is_new():
 			self.file_size = self.get_folder_size()
-			frappe.db.set_value("File", self.name, "file_size", self.file_size)
+			self.db_set('file_size', self.file_size)
 
 			for folder in self.get_ancestors():
 				frappe.db.set_value("File", folder, "file_size", self.get_folder_size(folder))
@@ -93,7 +93,7 @@ class File(NestedSet):
 	def update_parent_folder_size(self):
 		"""Update size of parent folder"""
 		if self.folder and not self.is_folder: # it not home
-			frappe.get_doc("File", self.folder).save(ignore_permissions=True)
+			frappe.get_doc("File", self.folder).set_folder_size()
 
 	def set_folder_name(self):
 		"""Make parent folders if not exists based on reference doctype and name"""
diff --git a/frappe/public/js/frappe/form/grid.js b/frappe/public/js/frappe/form/grid.js
index 3aa05bac9d..d31b971d21 100644
--- a/frappe/public/js/frappe/form/grid.js
+++ b/frappe/public/js/frappe/form/grid.js
@@ -718,7 +718,7 @@ frappe.ui.form.GridRow = Class.extend({
 		var me = this;
 		// show static for field based on
 		// whether grid is editable
-		if(this.grid.is_editable() && this.doc && show !== false) {
+		if(this.grid.allow_on_grid_editing() && this.grid.is_editable() && this.doc && show !== false) {
 
 			// disable other editale row
 			if(frappe.ui.form.editable_row