diff --git a/js/functions.js b/js/functions.js
index a94c3b9450..14c8fcfd3c 100644
--- a/js/functions.js
+++ b/js/functions.js
@@ -112,6 +112,10 @@ $.ajaxPrefilter(function (options, originalOptions) {
  * @param {object} $thisElement a jQuery object pointing to the element
  */
 Functions.addDatepicker = function ($thisElement, type, options) {
+    if (type !== 'date' && type !== 'time' && type !== 'datetime' && type !== 'timestamp') {
+        return;
+    }
+
     var showTimepicker = true;
     if (type === 'date') {
         showTimepicker = false;
diff --git a/js/table/select.js b/js/table/select.js
index 41a89d2e9d..3050e3c6fa 100644
--- a/js/table/select.js
+++ b/js/table/select.js
@@ -380,7 +380,7 @@ AJAX.registerOnload('table/select.js', function () {
                             '<span class="small_font">' + max + '</span>' +
                             '</fieldset>'
                         ).dialog({
-                            minWidth: 500,
+                            width: 'auto',
                             maxHeight: 400,
                             modal: true,
                             buttons: buttonOptions,