diff --git a/src/timeInput.jsx b/src/timeInput.jsx
index d8dade8..ac77b82 100644
--- a/src/timeInput.jsx
+++ b/src/timeInput.jsx
@@ -78,6 +78,14 @@ class TimeInput extends Component {
         if (val == this.state.time) {
             return;
         }
+        
+        if (val.length === 6) {
+            const times = val.split(":");
+            if(times.length === 2 && times[1].length === 3) {
+                val = val.substr(0, 3) + val.substr(4, 2);
+            }
+        }
+        
         if (this.isValid(val)) {
 
             if (val.length === 2 && this.lastVal.length !== 3 && val.indexOf(':') === -1) {
@@ -87,6 +95,13 @@ class TimeInput extends Component {
             if (val.length === 2 && this.lastVal.length === 3) {
                 val = val.slice(0, 1);
             }
+            
+            if (val.length === 4) {
+                const times = val.split(":");
+                if(times.length === 2 && times[1].length === 1) {
+                    val = val.substr(0, 3) + "0" + val.substr(3, 1);
+                }
+            }
 
             if (val.length > 5) {
                 return false;