diff --git a/frappe/core/doctype/file/file.py b/frappe/core/doctype/file/file.py
index 13435d5d47..c5b218f42f 100755
--- a/frappe/core/doctype/file/file.py
+++ b/frappe/core/doctype/file/file.py
@@ -90,6 +90,9 @@ class File(Document):
 			self.name = frappe.generate_hash(length=10)
 
 	def before_insert(self):
+		# Ensure correct formatting and type
+		self.file_url = unquote(self.file_url) if self.file_url else ""
+
 		self.set_folder_name()
 		self.set_is_private()
 		self.set_file_name()
@@ -117,9 +120,6 @@ class File(Document):
 		if self.is_folder:
 			return
 
-		# Ensure correct formatting and type
-		self.file_url = unquote(self.file_url) if self.file_url else ""
-
 		self.validate_attachment_references()
 
 		# when dict is passed to get_doc for creation of new_doc, is_new returns None