diff --git a/src/bootstrap/match.tpl.html b/src/bootstrap/match.tpl.html
index b766d4680..37eb36d8e 100644
--- a/src/bootstrap/match.tpl.html
+++ b/src/bootstrap/match.tpl.html
@@ -1,9 +1,12 @@
-<button type="button" class="btn btn-default form-control ui-select-match" tabindex="-1"
-        ng-hide="$select.open"
-        ng-disabled="$select.disabled"
-        ng-class="{'btn-default-focus':$select.focus}";
-        ng-click="$select.activate()">
-  <span ng-show="$select.isEmpty()" class="text-muted">{{$select.placeholder}}</span>
-  <span ng-hide="$select.isEmpty()" ng-transclude></span>
-  <span class="caret ui-select-toggle" ng-click="$select.toggle($event)"></span>
-</button>
+<div class="btn-group ui-select-match btn-block" ng-hide="$select.open" ng-disabled="$select.disabled" ng-class="{'btn-default-focus':$select.focus}">
+  <button type="button" class="btn btn-default" ng-class="{'col-sm-8 col-md-10': $select.allowClear && !$select.isEmpty(),'col-sm-10 col-md-11': !$select.allowClear || $select.isEmpty()}" tabindex="-1" ;="" ng-click="$select.activate()">
+    <span ng-show="$select.isEmpty()" class="text-muted">{{$select.placeholder}}</span>
+    <span ng-hide="$select.isEmpty()" ng-transclude=""></span>
+  </button>
+  <button class="btn btn-default col-sm-2 col-md-1" ng-if="$select.allowClear && !$select.isEmpty()" ng-click="$select.select(undefined)">
+    <span class="glyphicon glyphicon-remove ui-select-toggle"></span>
+  </button>
+  <button class="btn btn-default col-sm-2 col-md-1" ng-click="$select.activate()">
+    <span class="caret ui-select-toggle" ng-click="$select.toggle($event)"></span>
+  </button>
+</div>
\ No newline at end of file
diff --git a/test/select.spec.js b/test/select.spec.js
index accb36376..2d1cf8795 100644
--- a/test/select.spec.js
+++ b/test/select.spec.js
@@ -83,7 +83,7 @@ describe('ui-select tests', function() {
   }
 
   function getMatchLabel(el) {
-    return $(el).find('.ui-select-match > span[ng-transclude]:not(.ng-hide)').text();
+    return $(el).find('.ui-select-match > button:first > span[ng-transclude]:not(.ng-hide)').text();
   }
 
   function clickItem(el, text) {
@@ -97,7 +97,7 @@ describe('ui-select tests', function() {
   }
 
   function clickMatch(el) {
-    $(el).find('.ui-select-match').click();
+    $(el).find('.ui-select-match > button:first').click();
     scope.$digest();
   }