diff --git a/css/all-app.css b/css/all-app.css
index e308d5e..52ec682 100644
--- a/css/all-app.css
+++ b/css/all-app.css
@@ -1937,12 +1937,12 @@
 /* font settings */
 
 h1, h2, h3, h4, h5 {
-	font-family: "Helvetica Neue", Helvetica, "Helvetica Neue", sans-serif;
+	font-family: Arial, sans-serif;
 	margin-top: 0.2em;
 }
 
 body {
-	font-family: "Helvetica Neue", Helvetica, "Helvetica Neue", sans-serif;
+	font-family: Arial, sans-serif;
 	font-size: 13px;
 	background-color: #eee;
 }
@@ -3783,12 +3783,12 @@
  *	erpnext/startup/startup.css
  */
 h1, h2, h3, h4, h5 {
-	font-family: "Helvetica Neue", "Open Sans", Helvetica, sans-serif;
+	font-family: Arial, Helvetica, sans-serif;
 	margin-top: 0.2em;
 }
 
 body {
-	font-family: "Helvetica Neue", "Open Sans", Helvetica, sans-serif;
+	font-family: Arial, Helvetica, sans-serif;
 	font-size: 13px;
 }
 
diff --git a/css/all-web.css b/css/all-web.css
index 3cacea4..1d8f8d6 100644
--- a/css/all-web.css
+++ b/css/all-web.css
@@ -1798,12 +1798,12 @@
 /* font settings */
 
 h1, h2, h3, h4, h5 {
-	font-family: "Helvetica Neue", Helvetica, "Helvetica Neue", sans-serif;
+	font-family: Arial, sans-serif;
 	margin-top: 0.2em;
 }
 
 body {
-	font-family: "Helvetica Neue", Helvetica, "Helvetica Neue", sans-serif;
+	font-family: Arial, sans-serif;
 	font-size: 13px;
 	background-color: #eee;
 }
@@ -2481,12 +2481,12 @@
  *	erpnext/startup/startup.css
  */
 h1, h2, h3, h4, h5 {
-	font-family: "Helvetica Neue", "Open Sans", Helvetica, sans-serif;
+	font-family: Arial, Helvetica, sans-serif;
 	margin-top: 0.2em;
 }
 
 body {
-	font-family: "Helvetica Neue", "Open Sans", Helvetica, sans-serif;
+	font-family: Arial, Helvetica, sans-serif;
 	font-size: 13px;
 }
 
diff --git a/erpnext/startup/startup.css b/erpnext/startup/startup.css
index 490b2f4..de76623 100644
--- a/erpnext/startup/startup.css
+++ b/erpnext/startup/startup.css
@@ -1,10 +1,10 @@
 h1, h2, h3, h4, h5 {
-	font-family: "Helvetica Neue", "Open Sans", Helvetica, sans-serif;
+	font-family: Arial, Helvetica, sans-serif;
 	margin-top: 0.2em;
 }
 
 body {
-	font-family: "Helvetica Neue", "Open Sans", Helvetica, sans-serif;
+	font-family: Arial, Helvetica, sans-serif;
 	font-size: 13px;
 }
 
diff --git a/js/all-app.js b/js/all-app.js
index a588369..6e232cf 100644
--- a/js/all-app.js
+++ b/js/all-app.js
@@ -1724,7 +1724,8 @@
 _f.Frm.prototype.email_doc=function(){if(!_e.dialog)_e.make();sel=this.print_sel;var c=$td(_e.dialog.rows['Format'].tab,0,1);if(c.cur_sel){c.removeChild(c.cur_sel);c.cur_sel=null;}
 c.appendChild(this.print_sel);c.cur_sel=this.print_sel;_e.dialog.widgets['Send With Attachments'].checked=0;if(cur_frm.doc.file_list){$ds(_e.dialog.rows['Send With Attachments']);}else{$dh(_e.dialog.rows['Send With Attachments']);}
 _e.dialog.widgets['Subject'].value=get_doctype_label(this.meta.name)+': '+this.docname;_e.dialog.show();}
-_f.Frm.prototype.rename_notify=function(dt,old,name){if(this.docname==old)
+_f.Frm.prototype.rename_notify=function(dt,old,name){if(this.meta.in_dialog)
+return;if(this.docname==old)
 this.docname=name;else
 return;this.is_editable[name]=this.is_editable[old];delete this.is_editable[old];if(this&&this.opendocs[old]){local_dt[dt][name]=local_dt[dt][old];local_dt[dt][old]=null;}
 delete this.opendocs[old];this.opendocs[name]=true;wn.re_route[window.location.hash]='Form/'+encodeURIComponent(this.doctype)+'/'+encodeURIComponent(name);wn.set_route('Form',this.doctype,name);}