diff --git a/src/lib/ui/Navigation.svelte b/src/lib/ui/Navigation.svelte
index ef16b70..01a2769 100644
--- a/src/lib/ui/Navigation.svelte
+++ b/src/lib/ui/Navigation.svelte
@@ -32,7 +32,9 @@
         let route;
         switch (name) {
             case "timeline":
+                if (!get(client).user) break;
                 route = "/";
+                getTimeline(true);
                 break;
             case "notifcations":
             case "explore":
@@ -66,15 +68,16 @@
 
     <div id="nav-items">
         <Button label="Timeline"
-                on:click={handle_btn("timeline")}
-                active={path == "/"}>
+                on:click={() => handle_btn("timeline")}
+                active={path == "/" && $client.user}
+                disabled={!$client.user}>
             <svelte:fragment slot="icon">
                 <TimelineIcon/>
             </svelte:fragment>
             Timeline
         </Button>
         <Button label="Notifications"
-                on:click={handle_btn("notifications")}
+                on:click={() => handle_btn("notifications")}
                 active={path == "/notifications"}
                 disabled>
             <svelte:fragment slot="icon">