diff --git a/app/views/shared/_accessible_combobox.html.erb b/app/views/shared/_accessible_combobox.html.erb
index 2aca224..4fe65ca 100644
--- a/app/views/shared/_accessible_combobox.html.erb
+++ b/app/views/shared/_accessible_combobox.html.erb
@@ -1,6 +1,5 @@
 <% if !models.nil? %>
   <% json = {} %>
-  <% tooltip = tooltip ||= _('Please select a valid %{entity} from the list.' % {entity: attribute}) %>
   <% models.map{|m| json[m[attribute]] = m.id} %>
 
   <input type="text" name="<%= name %>" id="<%= id %>" 
@@ -10,9 +9,7 @@
          data-combobox-case-sensitive="no"
          data-combobox-search-option="containing"
          data-combobox-allow-suggestion-on-empty="true"
-         value="<%= default_selection[attribute] unless default_selection.nil? %>"
-         data-toggle="tooltip" 
-         data-content="<%= tooltip %>" />
+         value="<%= default_selection[attribute] unless default_selection.nil? %>" />
   <datalist id="<%= id %>_list">
     <% models.each do |model| %>
       <option value="<%= model[attribute] %>" />
diff --git a/lib/assets/javascripts/views/plans/new.js b/lib/assets/javascripts/views/plans/new.js
index d2f475d..fc4b489 100644
--- a/lib/assets/javascripts/views/plans/new.js
+++ b/lib/assets/javascripts/views/plans/new.js
@@ -20,15 +20,13 @@
   });
 
   // If there was no selection, highlight the box and display tooltip 
-  $("#plan_org_id").change(function(){
-    var msg = ($(this).val().trim().length <= 0 ? __('Please select a valid research institution from the list') : '');
-    toggleAutocompleteError($("#plan_org_name"), $(this), msg);
+  $("#plan_funder_name").blur(function(){
+    var msg = ($("#plan_funder_id").val().trim().length <= 0 ? __('Please select a valid funding organisation from the list') : '');
+    toggleAutocompleteError($(this), $("#plan_funder_id"), msg);
   });
-  $("#plan_funder_id").change(function(){
-    if($("#plan_funder_name").is(":focus")){
-      var msg = ($(this).val().trim().length <= 0 ? __('Please select a valid funding organisation from the list') : '');
-      toggleAutocompleteError($("#plan_funder_name"), $(this), msg);
-    }
+  $("#plan_org_name").blur(function(){
+    var msg = ($("#plan_org_id").val().trim().length <= 0 ? __('Please select a valid research organisation from the list') : '');
+    toggleAutocompleteError($(this), $("#plan_org_id"), msg);
   });
 
   // Make sure the checkbox is unchecked if we're entering text