diff --git a/frappe/public/css/docs.css b/frappe/public/css/docs.css
index ca262cdaf6..e404d9fa2f 100644
--- a/frappe/public/css/docs.css
+++ b/frappe/public/css/docs.css
@@ -57,16 +57,18 @@
 }
 #search-modal .modal-header {
   background: #fff;
-  display: table;
   width: 100%;
 }
-#search-modal .modal-header form,
-#search-modal .modal-header button {
-  display: table-cell;
+#search-modal .modal-header form {
   vertical-align: middle;
 }
 #search-modal .modal-header button {
-  height: 30px;
+  line-height: 0;
+  position: absolute;
+  right: 0;
+  top: 0;
+  z-index: 9;
+  padding: 9px;
 }
 .dropdown-navbar-new-comments > a {
   border: 0;
diff --git a/frappe/public/css/navbar.css b/frappe/public/css/navbar.css
index a702a41207..60e906c106 100644
--- a/frappe/public/css/navbar.css
+++ b/frappe/public/css/navbar.css
@@ -57,16 +57,18 @@
 }
 #search-modal .modal-header {
   background: #fff;
-  display: table;
   width: 100%;
 }
-#search-modal .modal-header form,
-#search-modal .modal-header button {
-  display: table-cell;
+#search-modal .modal-header form {
   vertical-align: middle;
 }
 #search-modal .modal-header button {
-  height: 30px;
+  line-height: 0;
+  position: absolute;
+  right: 0;
+  top: 0;
+  z-index: 9;
+  padding: 9px;
 }
 .dropdown-navbar-new-comments > a {
   border: 0;
diff --git a/frappe/public/js/frappe/ui/toolbar/navbar.html b/frappe/public/js/frappe/ui/toolbar/navbar.html
index 6aae9b6189..6d5f4862b1 100644
--- a/frappe/public/js/frappe/ui/toolbar/navbar.html
+++ b/frappe/public/js/frappe/ui/toolbar/navbar.html
@@ -61,9 +61,9 @@
 							<div class="input-group" style="width: 100%">
 								<input id="modal-search" type="text" class="form-control"
 								placeholder="{%= __("Search or type a command") %}" aria-haspopup="true">
+								<button type="reset" class="close"><i class="octicon octicon-x"></i></button>
 							</div>
 						</form>
-						<button type="button" class="close" data-dismiss="modal"><i class="octicon octicon-x"></i></button>
 					</div>
 				</div>
 			</div>
diff --git a/frappe/public/less/navbar.less b/frappe/public/less/navbar.less
index fbc96336cc..51435ed1dd 100644
--- a/frappe/public/less/navbar.less
+++ b/frappe/public/less/navbar.less
@@ -69,15 +69,19 @@
 	}
 	.modal-header {
 		background: #fff;
-		display: table;
 		width: 100%;
 
-		form, button {
-			display: table-cell;
+		form {
 			vertical-align: middle;
 		}
+
 		button {
-			height: 30px;
+			line-height: 0;
+			position: absolute;
+			right: 0;
+			top: 0;
+			z-index: 9;
+			padding: 9px;
 		}
 	}
 }