diff --git a/dashboard/src/Index.vue b/dashboard/src/Index.vue
index 6c92fc97c..5c3816626 100644
--- a/dashboard/src/Index.vue
+++ b/dashboard/src/Index.vue
@@ -132,6 +132,8 @@ function onHashChange() {
   else if (activeSidebarItem.value.indexOf('user-directory') === 0) activeSidebarGroup.value = 'user-directory';
   else activeSidebarGroup.value = '';
 
+  console.log('heading to ', v)
+
   if (v === VIEWS.APPS) {
     view.value = VIEWS.APPS;
   } else if (v.indexOf(VIEWS.APPSTORE) === 0 && profile.value.isAtLeastAdmin) {
@@ -170,7 +172,7 @@ function onHashChange() {
     view.value = VIEWS.SYSTEM_LOCALE;
   } else if (v === VIEWS.SYSTEM_DOCKER && profile.value.isAtLeastAdmin) {
     view.value = VIEWS.SYSTEM_DOCKER;
-  } else if (v === VIEWS.SYSTEM_EVENTLOG && profile.value.isAtLeastAdmin) {
+  } else if (v.indexOf(VIEWS.SYSTEM_EVENTLOG) === 0 && profile.value.isAtLeastAdmin) {
     view.value = VIEWS.SYSTEM_EVENTLOG;
   } else if (v === VIEWS.SYSTEM_UPDATE && profile.value.isAtLeastAdmin) {
     view.value = VIEWS.SYSTEM_UPDATE;
diff --git a/dashboard/src/views/EventlogView.vue b/dashboard/src/views/EventlogView.vue
index 642c01162..da2b1a988 100644
--- a/dashboard/src/views/EventlogView.vue
+++ b/dashboard/src/views/EventlogView.vue
@@ -1,6 +1,6 @@
 <script setup>
 
-import { ref, reactive, onMounted, watch } from 'vue';
+import { ref, reactive, onMounted, onUnmounted, watch } from 'vue';
 import moment from 'moment';
 import { Button, TextInput, MultiSelect } from '@cloudron/pankow';
 import { useDebouncedRef, copyToClipboard } from '@cloudron/pankow/utils';
@@ -135,12 +135,22 @@ function onCopySource(eventlog) {
 watch(actions, onRefresh);
 watch(search, onRefresh);
 
+async function onHashChange() {
+  const params = new URLSearchParams(window.location.hash.slice(window.location.hash.indexOf('?')));
+  search.value = params.get('search') || '';
+}
+
 onMounted(async () => {
   const [error, result] = await appsModel.list();
   if (error) console.error(error);
   else apps.value = result;
 
-  await onRefresh();
+  window.addEventListener('hashchange', onHashChange);
+  onHashChange();
+});
+
+onUnmounted(() => {
+  window.removeEventListener('hashchange', onHashChange);
 });
 
 </script>