diff --git a/client/application.js b/client/application.js
index f3ec9d2..25e3725 100644
--- a/client/application.js
+++ b/client/application.js
@@ -86,7 +86,7 @@
         },
 
         ready: function() {
-            $('.selectpicker').selectpicker();
+            $('#keywords').selectpicker();
 
             $.getJSON('/node/keywords', function(keywords) {
                 for (var i = 0, count = keywords.length; i < count; ++i) {
@@ -96,8 +96,11 @@
                     }));
                 }
 
-                $('.selectpicker').selectpicker('refresh');
-                $('#search').prop('disabled', false);
+                $('#keywords').selectpicker('refresh');
+                $('#keywords').change(function() {
+                    $('#search').prop('disabled', $(this).val() === null);
+                });
+
                 $('#search').click(onSearch);
             });
         }
diff --git a/client/index.html b/client/index.html
index c4b17f0..ff7d873 100644
--- a/client/index.html
+++ b/client/index.html
@@ -22,7 +22,7 @@
                     <div class="form-group">
                         <label for="keywords" class="col-md-2 control-label">Keywords</label>
                         <div class="col-md-10">
-                            <select id="keywords" class="form-control selectpicker" multiple="multiple" data-max-options="4" data-live-search="data-live-search" name="keywords"></select>
+                            <select id="keywords" class="form-control" multiple="multiple" data-max-options="4" data-live-search="data-live-search" name="keywords"></select>
                         </div>
                     </div>
                     <div class="form-group">