diff --git a/client/application.js b/client/application.js
index 5244c06..218f65e 100644
--- a/client/application.js
+++ b/client/application.js
@@ -115,10 +115,15 @@
                 }
 
                 $('#search').click(onSearch);
+
                 $('#learn').click(onLearn);
+                $('#keyword').bind('input', function() {
+                    $('#learn').prop('disabled', !$(this).val());
+                });
+
                 $('#keywords').selectpicker('refresh');
                 $('#keywords').change(function() {
-                    $('#search').prop('disabled', $(this).val() === null);
+                    $('#search').prop('disabled', !$(this).val());
                 });
             });
         }
diff --git a/client/index.html b/client/index.html
index 412f02b..c2e012c 100644
--- a/client/index.html
+++ b/client/index.html
@@ -91,7 +91,7 @@
                         <div class="modal-footer">
                             <div class="btn-group">
                                 <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
-                                <button type="button" class="btn btn-primary" id="learn">Learn</button>
+                                <button type="button" class="btn btn-primary" id="learn" disabled="disabled">Learn</button>
                             </div>
                         </div>
                     </div>