diff --git a/frappe/public/css/mobile.css b/frappe/public/css/mobile.css
index d3688f1f58..35969f1792 100644
--- a/frappe/public/css/mobile.css
+++ b/frappe/public/css/mobile.css
@@ -198,19 +198,11 @@ body {
     margin: 0px;
     padding: 0px;
     width: 100%;
-    height: 100%;
-    position: fixed;
-    top: 0px;
-    bottom: 0px;
-    left: 0px;
-    right: 0px;
-    overflow-y: auto;
     background-color: #fff;
   }
   .modal .modal-content {
     border-radius: 0px;
     border: none;
-    box-shadow: none;
     height: 100%;
   }
   .modal .modal-body .form-layout {
diff --git a/frappe/public/js/frappe/ui/dialog.js b/frappe/public/js/frappe/ui/dialog.js
index b422286fbc..c9b0a3289f 100644
--- a/frappe/public/js/frappe/ui/dialog.js
+++ b/frappe/public/js/frappe/ui/dialog.js
@@ -38,9 +38,6 @@ frappe.ui.Dialog = frappe.ui.FieldGroup.extend({
 		var me = this;
 		this.$wrapper
 			.on("hide.bs.modal", function() {
-				if(me.body_hidden) {
-					$("#body_div").toggle(true);
-				}
 				me.display = false;
 				if(frappe.ui.open_dialogs[frappe.ui.open_dialogs.length-1]===me) {
 					frappe.ui.open_dialogs.pop();
@@ -54,10 +51,6 @@ frappe.ui.Dialog = frappe.ui.FieldGroup.extend({
 			})
 			.on("shown.bs.modal", function() {
 				// focus on first input
-				if(frappe.is_mobile()) {
-					$("#body_div").toggle(false);
-					me.body_hidden = true;
-				}
 				me.display = true;
 				cur_dialog = me;
 				frappe.ui.open_dialogs.push(me);
diff --git a/frappe/public/js/frappe/ui/toolbar/toolbar.js b/frappe/public/js/frappe/ui/toolbar/toolbar.js
index 118f3626f2..aa96c2ea13 100644
--- a/frappe/public/js/frappe/ui/toolbar/toolbar.js
+++ b/frappe/public/js/frappe/ui/toolbar/toolbar.js
@@ -26,6 +26,14 @@ frappe.ui.toolbar.Toolbar = Class.extend({
 			$("header .navbar .custom-menu").remove();
 		});
 
+		//focus search-modal on show in mobile view
+		$('#search-modal').on('shown.bs.modal', function () {
+			var search_modal = $(this);
+			setTimeout(function() {
+				search_modal.find('#modal-search').focus();
+			}, 300);
+		});
+
 		frappe.search.setup();
 	},
 
diff --git a/frappe/public/less/mobile.less b/frappe/public/less/mobile.less
index 47cc7088a3..be38c7a00d 100644
--- a/frappe/public/less/mobile.less
+++ b/frappe/public/less/mobile.less
@@ -232,21 +232,12 @@ body {
 			margin: 0px;
 			padding: 0px;
 			width: 100%;
-			height: 100%;
-
-			position: fixed;
-			top: 0px;
-			bottom: 0px;
-			left: 0px;
-			right: 0px;
-			overflow-y: auto;
 			background-color: #fff;
 		}
 
 		.modal-content {
 			border-radius: 0px;
 			border: none;
-			box-shadow: none;
 			height: 100%;
 		}