diff --git a/erpnext/public/css/website.css b/erpnext/public/css/website.css
index 7d02940..9b4df40 100644
--- a/erpnext/public/css/website.css
+++ b/erpnext/public/css/website.css
@@ -48,3 +48,9 @@
 .product-text {
   padding: 15px 0px;
 }
+@media (max-width: 767px) {
+  .product-search {
+    width: 100%;
+    margin-bottom: 13px;
+  }
+}
diff --git a/erpnext/public/less/website.less b/erpnext/public/less/website.less
index c42cb4c..c0667cc 100644
--- a/erpnext/public/less/website.less
+++ b/erpnext/public/less/website.less
@@ -51,3 +51,10 @@
 .product-text {
 	padding: 15px 0px;
 }
+
+@media (max-width: 767px) {
+	.product-search {
+		width: 100%;
+		margin-bottom: 13px;
+	}
+}
diff --git a/erpnext/templates/includes/product_search_box.html b/erpnext/templates/includes/product_search_box.html
index d4f6e7b..a5592c1 100644
--- a/erpnext/templates/includes/product_search_box.html
+++ b/erpnext/templates/includes/product_search_box.html
@@ -2,7 +2,7 @@
 frappe.ready(function() {
 	$(".product-search").remove();
 
-	$('<div class="product-search">\
+	$('<div class="product-search pull-right">\
 			<form class="form-inline form-search">\
 			<div class="input-group">\
 				<input class="form-control" type="text" id="product-search" placeholder="Product Search...">\
@@ -12,13 +12,13 @@
 				</span>\
 			</div>\
 		</form>\
-	</div>').appendTo(".page-header-right");
+	</div>').prependTo(".page-header-block");
 
 	$('.dropdown-toggle').dropdown();
 	$("#btn-product-search").click(function() {
 		var txt = $("#product-search").val();
 		if(txt) {
-			window.location.href="product_search?q=" + txt;
+			window.location.href="/product_search?q=" + txt;
 		}
 		return false;
 	});