diff --git a/frappe/website/doctype/web_template/web_template.js b/frappe/website/doctype/web_template/web_template.js
index def4e2dab1..df5b3cb2c1 100644
--- a/frappe/website/doctype/web_template/web_template.js
+++ b/frappe/website/doctype/web_template/web_template.js
@@ -8,14 +8,14 @@ frappe.ui.form.on('Web Template', {
 		}
 
 		frm.toggle_display('standard', frappe.boot.developer_mode);
-		frm.toggle_display('template', !frm.doc.standard);
 	},
 	standard: function(frm) {
-		if (!frm.doc.standard) {
+		if (!frm.doc.standard && !frm.is_new()) {
 			// If standard changes from true to false, hide template until
 			// the next save. Changes will get overwritten from the backend
 			// on save and should not be possible in the UI.
 			frm.toggle_display('template', false);
+			frm.dashboard.clear_headline();
 			frm.dashboard.set_headline(__('Please save to edit the template.'));
 		}
 	}