diff --git a/js/functions.js b/js/functions.js
index dcc1f4de7a..84049cdbb3 100644
--- a/js/functions.js
+++ b/js/functions.js
@@ -171,6 +171,7 @@ function addDateTimePicker() {
             var showMillisec = false;
             var showMicrosec = false;
             var timeFormat = 'HH:mm:ss';
+            var hourMax = 23;
             // check for decimal places of seconds
             if (decimals > 0 && type.indexOf('time') != -1){
                 if (decimals > 3) {
@@ -182,12 +183,15 @@ function addDateTimePicker() {
                     timeFormat = 'HH:mm:ss.l';
                 }
             }
+            if (type == 'time'){
+                hourMax = 99;
+            }
             PMA_addDatepicker($(this), type, {
                 showMillisec: showMillisec,
                 showMicrosec: showMicrosec,
-                timeFormat: timeFormat
+                timeFormat: timeFormat,
+                hourMax: hourMax
             });
-
             // Add a tip regarding entering MySQL allowed-values
             // for TIME and DATE data-type
             if ($(this).hasClass('timefield')) {