diff --git a/packages/app-frontend/src/features/timeline/TimelineEventList.vue b/packages/app-frontend/src/features/timeline/TimelineEventList.vue
index 3dc4a8977..5a43eeabe 100644
--- a/packages/app-frontend/src/features/timeline/TimelineEventList.vue
+++ b/packages/app-frontend/src/features/timeline/TimelineEventList.vue
@@ -144,9 +144,8 @@ export default defineComponent({
     // Auto bottom scroll
 
     function scrollToBottom () {
-      if (!scroller.value) return
-
       requestAnimationFrame(() => {
+        if (!scroller.value) return
         const scrollerEl = scroller.value.$el
         scrollerEl.scrollTop = scrollerEl.scrollHeight
       })
diff --git a/packages/app-frontend/src/features/timeline/composable/layers.ts b/packages/app-frontend/src/features/timeline/composable/layers.ts
index b67e933e9..a0744375e 100644
--- a/packages/app-frontend/src/features/timeline/composable/layers.ts
+++ b/packages/app-frontend/src/features/timeline/composable/layers.ts
@@ -68,9 +68,22 @@ export function useLayers () {
     return list.includes(layer.id)
   }
 
+  function resetSelectedStatus () {
+    selectedLayer.value = null
+    inspectedEvent.value = null
+    selectedEvent.value = null
+    hoverLayerId.value = null
+    setStorage('selected-layer-id', '')
+  }
+
   function setLayerHidden (layer: Layer, hidden: boolean) {
     const list = getHiddenLayers(currentAppId.value)
     const index = list.indexOf(layer.id)
+
+    if (selectedLayer.value === layer) {
+      resetSelectedStatus()
+    }
+
     if (hidden && index === -1) {
       list.push(layer.id)
     } else if (!hidden && index !== -1) {