diff --git a/frappe/public/css/bootstrap.css b/frappe/public/css/bootstrap.css
index c05e2f2432..183dd7fc4b 100644
--- a/frappe/public/css/bootstrap.css
+++ b/frappe/public/css/bootstrap.css
@@ -2558,14 +2558,14 @@ output {
           box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 3px rgba(206, 213, 219, .6);
 }
 .form-control::-moz-placeholder {
-  color: #999;
+  color: #d1d8dd;
   opacity: 1;
 }
 .form-control:-ms-input-placeholder {
-  color: #999;
+  color: #d1d8dd;
 }
 .form-control::-webkit-input-placeholder {
-  color: #999;
+  color: #d1d8dd;
 }
 .form-control[disabled],
 .form-control[readonly],
@@ -6609,3 +6609,4 @@ h4.modal-title {
 .navbar-search-icon {
   color: #b8c2cb;
 }
+/*# sourceMappingURL=bootstrap.css.map */
diff --git a/frappe/public/js/frappe/dom.js b/frappe/public/js/frappe/dom.js
index cbe0d604aa..fbab55683c 100644
--- a/frappe/public/js/frappe/dom.js
+++ b/frappe/public/js/frappe/dom.js
@@ -71,22 +71,25 @@ frappe.dom = {
 				})
 				.appendTo("#body_div");
 
-			if (msg) {
-				freeze.html(repl('<div class="freeze-message-container"><div class="freeze-message">%(msg)s</div></div>',
-					{msg: msg}));
-			}
+			freeze.html(repl('<div class="freeze-message-container"><div class="freeze-message">%(msg)s</div></div>',
+				{msg: msg || ""}));
 
 			setTimeout(function() { freeze.addClass("in") }, 1);
+
+		} else {
+			$("#freeze").addClass("in");
 		}
 
 		frappe.dom.freeze_count++;
 	},
 	unfreeze: function() {
-		if(!frappe.dom.freeze_count)return; // anything open?
+		if(!frappe.dom.freeze_count) return; // anything open?
 		frappe.dom.freeze_count--;
 		if(!frappe.dom.freeze_count) {
 			var freeze = $('#freeze').removeClass("in");
-			setTimeout(function() { freeze.remove(); }, 150);
+			setTimeout(function() {
+				if(!frappe.dom.freeze_count) { freeze.remove(); }
+			}, 150);
 		}
 	},
 	save_selection: function() {
diff --git a/frappe/public/js/frappe/form/grid.js b/frappe/public/js/frappe/form/grid.js
index 5b98c87223..b516b6f10d 100644
--- a/frappe/public/js/frappe/form/grid.js
+++ b/frappe/public/js/frappe/form/grid.js
@@ -397,7 +397,7 @@ frappe.ui.form.GridRow = Class.extend({
 		if (show===undefined) show = !!!open_row;
 
 		// call blur
-		document.activeElement && document.activeElement.blur()
+		document.activeElement && document.activeElement.blur();
 
 		if(show && open_row) {
 			if(open_row==this) {