diff --git a/resources/js/packages/ui/package.json b/resources/js/packages/ui/package.json
index a61ede2e..8df4b66c 100644
--- a/resources/js/packages/ui/package.json
+++ b/resources/js/packages/ui/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@solidtime/ui",
-    "version": "0.0.18",
+    "version": "0.0.19",
     "description": "Package containing the solidtime ui components",
     "main": "./dist/solidtime-ui-lib.umd.cjs",
     "module": "./dist/solidtime-ui-lib.js",
diff --git a/resources/js/packages/ui/src/FullCalendar/TimeEntryCalendar.vue b/resources/js/packages/ui/src/FullCalendar/TimeEntryCalendar.vue
index 1d3113d7..98f1e50d 100644
--- a/resources/js/packages/ui/src/FullCalendar/TimeEntryCalendar.vue
+++ b/resources/js/packages/ui/src/FullCalendar/TimeEntryCalendar.vue
@@ -314,6 +314,18 @@ watch(
     { deep: true }
 );
 
+let hasScrolledOnLoad = false;
+
+watch(
+    () => props.loading,
+    (loading) => {
+        if (!loading && !hasScrolledOnLoad) {
+            hasScrolledOnLoad = true;
+            scrollToCurrentTime();
+        }
+    }
+);
+
 onMounted(() => {
     scrollToCurrentTime();
     emitDatesChange();