diff --git a/date_popup/date_popup.js b/date_popup/date_popup.js
index 1847f84..4f0e33d 100644
--- a/date_popup/date_popup.js
+++ b/date_popup/date_popup.js
@@ -8,11 +8,18 @@ Drupal.behaviors.date_popup = {
     $('#'+ id).bind('focus', Drupal.settings.datePopup[id], function(e) {
       if (!$(this).hasClass('date-popup-init')) {
         var datePopup = e.data;
+        var popupSettings = {
+          onSelect: function (dateText, inst) {
+            $(this).focus();
+          }
+        }
+        // allow the onSelect to be overridden.
+        $.extend(popupSettings, datePopup.settings);
         // Explicitely filter the methods we accept.
         switch (datePopup.func) {
           case 'datepicker':
             $(this)
-              .datepicker(datePopup.settings)
+              .datepicker(popupSettings)
               .addClass('date-popup-init')
             $(this).click(function(){
               $(this).focus();
@@ -21,7 +28,7 @@ Drupal.behaviors.date_popup = {
 
           case 'timeEntry':
             $(this)
-              .timeEntry(datePopup.settings)
+              .timeEntry(popupSettings)
               .addClass('date-popup-init')
             $(this).click(function(){
               $(this).focus();
@@ -47,7 +54,7 @@ Drupal.behaviors.date_popup = {
 
             datePopup.settings.startTime = new Date(datePopup.settings.startTime);
             $(this)
-              .timepicker(datePopup.settings)
+              .timepicker(popupSettings)
               .addClass('date-popup-init');
             $(this).click(function(){
               $(this).focus();