diff --git a/frappe/public/js/frappe/ui/filters/edit_filter.html b/frappe/public/js/frappe/ui/filters/edit_filter.html
index 50b1e1b4e6..3908c63fa1 100644
--- a/frappe/public/js/frappe/ui/filters/edit_filter.html
+++ b/frappe/public/js/frappe/ui/filters/edit_filter.html
@@ -1,6 +1,6 @@
 <div class="filter-box">
 	<div class="list_filter row">
-		<div class="fieldname-select-area col-sm-4 form-group ui-front"></div>
+		<div class="fieldname-select-area col-sm-4 ui-front form-group"></div>
 		<div class="col-sm-2 form-group">
 			<select class="condition form-control">
 				{% for condition in conditions %}
@@ -8,17 +8,16 @@
 				{% endfor %}
 			</select>
 		</div>
-		<div class="col-sm-6 col-xs-12">
-			<div class="filter-field pull-left" style="width: calc(100% - 70px)"></div>
-			<div class="filter-actions pull-left">
-				<a class="set-filter-and-run btn btn-sm btn-primary pull-left">
-					<i class=" fa fa-check visible-xs"></i>
-					<span class="hidden-xs">{%= __("Apply") %}</span></a>
-				<a class="small grey remove-filter pull-left">
-					<i class="octicon octicon-trashcan visible-xs"></i>
-					<span class="hidden-xs">{%= __("Remove") %}</span></a>
+		<div class="col-sm-4 form-group">
+			<div class="filter-field"></div>
+		</div>
+		<div class="col-sm-2">
+			<div class="filter-actions">
+				<a class="set-filter-and-run btn btn-sm btn-primary">
+					<span>{%= __("Apply") %}</span></a>
+				<a class="small grey remove-filter">
+					<span>{%= __("Remove") %}</span></a>
 			</div>
-			<div class="clearfix"></div>
 		</div>
 	</div>
 </div>
diff --git a/frappe/public/less/filters.less b/frappe/public/less/filters.less
index 30894eea19..95580857e7 100644
--- a/frappe/public/less/filters.less
+++ b/frappe/public/less/filters.less
@@ -31,9 +31,17 @@
 	float: none;
 }
 
-.filter-box {
+.frappe-list .filter-box {
 	border-bottom: 1px solid @border-color;
-	padding: 10px 15px 3px;
+	padding: 10px 15px;
+}
+
+.filter-box {
+	.form-group {
+		@media (min-width: @screen-xs) {
+			margin-bottom: 0;
+		}
+	}
 
 	.remove-filter {
 		margin-top: 6px;
@@ -41,11 +49,9 @@
 	}
 
 	.filter-field {
-		padding-right: 15px;
-		width: calc(100% - 36px);
-
 		.frappe-control {
 			position: relative;
+			margin-bottom: 0;
 		}
 	}
 }
@@ -56,8 +62,6 @@
 		padding-right: 0px;
 	}
 	.filter-field {
-		width: 65% !important;
-
 		.frappe-control {
 			position: relative;
 		}