diff --git a/resources/js/Components/Common/TimeEntry/TimeEntryRangeSelector.vue b/resources/js/Components/Common/TimeEntry/TimeEntryRangeSelector.vue
index 125d56fb..6b05d7e1 100644
--- a/resources/js/Components/Common/TimeEntry/TimeEntryRangeSelector.vue
+++ b/resources/js/Components/Common/TimeEntry/TimeEntryRangeSelector.vue
@@ -37,14 +37,17 @@ watch(focused, (newValue, oldValue) => {
         updateTimeEntry();
     }
 });
+
+const open = ref(false);
 </script>
 
 <template>
     <div class="relative">
         <Dropdown
+            v-model="open"
+            @submit="open = false"
             align="bottom"
-            :close-on-content-click="false"
-            @submit="updateTimeEntry">
+            :close-on-content-click="false">
             <template #trigger>
                 <button
                     data-testid="time_entry_range_selector"
diff --git a/resources/js/Components/Common/TimePicker.vue b/resources/js/Components/Common/TimePicker.vue
index 15ad7ebf..49091822 100644
--- a/resources/js/Components/Common/TimePicker.vue
+++ b/resources/js/Components/Common/TimePicker.vue
@@ -17,7 +17,7 @@ const minutes = computed(() => {
 function updateMinutes(event: Event) {
     const target = event.target as HTMLInputElement;
     const newValue = target.value;
-    if (parseInt(newValue)) {
+    if (!isNaN(parseInt(newValue))) {
         model.value = dayjs(model.value)
             .utc()
             .set('minutes', parseInt(newValue))
@@ -28,7 +28,7 @@ function updateMinutes(event: Event) {
 function updateHours(event: Event) {
     const target = event.target as HTMLInputElement;
     const newValue = target.value;
-    if (parseInt(newValue)) {
+    if (!isNaN(parseInt(newValue))) {
         model.value = dayjs(model.value)
             .utc()
             .set('hours', parseInt(newValue))