diff --git a/src/bootstrap/match.tpl.html b/src/bootstrap/match.tpl.html
index 867aae1d0..8758d8d30 100644
--- a/src/bootstrap/match.tpl.html
+++ b/src/bootstrap/match.tpl.html
@@ -1,5 +1,5 @@
 <div class="ui-select-match" ng-hide="$select.open" ng-disabled="$select.disabled" ng-class="{'btn-default-focus':$select.focus}">
-  <button aria-label="{{ $select.baseTitle }} activate" type="button" class="btn btn-default btn-block ui-select-toggle" tabindex="-1" ;="" ng-disabled="$select.disabled" ng-click="$select.activate()">
+  <button aria-label="{{ $select.baseTitle }} activate" type="button" class="btn btn-default form-control ui-select-toggle" tabindex="-1" ;="" ng-disabled="$select.disabled" ng-click="$select.activate()">
     <span ng-show="$select.isEmpty()" class="ui-select-placeholder text-muted">{{$select.placeholder}}</span>
     <span ng-hide="$select.isEmpty()" class="ui-select-match-text" ng-class="{'ui-select-allow-clear': $select.allowClear && !$select.isEmpty()}" ng-transclude=""></span>
     <i class="caret pull-right" ng-click="$select.toggle($event)"></i>
diff --git a/src/select.css b/src/select.css
index c5aecbd2a..d875f35a1 100644
--- a/src/select.css
+++ b/src/select.css
@@ -82,6 +82,9 @@
 
 .ui-select-bootstrap .ui-select-toggle {
   position: relative;
+
+  /* Instead of center because of .btn */
+  text-align: left;
 }
 
 .ui-select-bootstrap .ui-select-toggle > .caret {
@@ -104,11 +107,6 @@
   border-bottom-right-radius: 0;
 }
 
-.ui-select-bootstrap > .ui-select-match {
-  /* Instead of center because of .btn */
-  text-align: left;
-}
-
 .ui-select-bootstrap > .ui-select-match > .caret {
   position: absolute;
   top: 45%;