diff --git a/src/selectize/match.tpl.html b/src/selectize/match.tpl.html
index dff19ce86..a72e9c26e 100644
--- a/src/selectize/match.tpl.html
+++ b/src/selectize/match.tpl.html
@@ -1 +1 @@
-<div ng-hide="$select.searchEnabled && ($select.open || $select.isEmpty())" class="ui-select-match" ng-transclude></div>
+<div ng-hide="$select.open || $select.isEmpty()" class="ui-select-match" ng-transclude></div>
diff --git a/src/selectize/select.tpl.html b/src/selectize/select.tpl.html
index 1106f29da..7403e406a 100644
--- a/src/selectize/select.tpl.html
+++ b/src/selectize/select.tpl.html
@@ -8,8 +8,8 @@
            ng-click="$select.toggle($event)"
            placeholder="{{$select.placeholder}}"
            ng-model="$select.search"
-           ng-hide="!$select.searchEnabled || (!$select.isEmpty() && !$select.open)"
-           ng-disabled="$select.disabled"
+           ng-hide="(!$select.isEmpty() && !$select.open)"
+           ng-disabled="!$select.searchEnabled || $select.disabled"
            aria-label="{{ $select.baseTitle }}">
   </div>
   <div class="ui-select-choices"></div>
diff --git a/test/select.spec.js b/test/select.spec.js
index 5b735689f..c301ebc52 100644
--- a/test/select.spec.js
+++ b/test/select.spec.js
@@ -1698,12 +1698,12 @@ describe('ui-select tests', function() {
 
       it('should show search input when true', function() {
         setupSelectComponent(true, 'selectize');
-        expect($(el).find('.ui-select-search')).not.toHaveClass('ng-hide');
+        expect($(el).find('.ui-select-search').is(':disabled')).toBe(false);
       });
 
       it('should hide search input when false', function() {
         setupSelectComponent(false, 'selectize');
-        expect($(el).find('.ui-select-search')).toHaveClass('ng-hide');
+        expect($(el).find('.ui-select-search').is(':disabled')).toBe(true);
       });
 
     });