diff --git a/webapp_calendar.py b/webapp_calendar.py
index 7bcd252f4..05128ed7f 100644
--- a/webapp_calendar.py
+++ b/webapp_calendar.py
@@ -512,7 +512,7 @@ def html_calendar(person_cache: {}, css_cache: {}, translate: {},
     nav_links = {}
     timeline_link_str = html_hide_from_screen_reader('🏠') + ' ' + \
         translate['Switch to timeline view']
-    nav_links[timeline_link_str] = cal_actor + '/inbox'
+    nav_links[timeline_link_str] = cal_actor + '/' + default_timeline
 
     day_of_month = 0
     dow = week_day_of_month_start(month_number, year)
diff --git a/webapp_person_options.py b/webapp_person_options.py
index 2a0995904..7a3e86f11 100644
--- a/webapp_person_options.py
+++ b/webapp_person_options.py
@@ -30,6 +30,7 @@ from webapp_utils import html_footer
 from webapp_utils import get_broken_link_substitute
 from webapp_utils import html_keyboard_navigation
 from webapp_utils import get_banner_file
+from webapp_utils import html_hide_from_screen_reader
 
 
 def html_person_options(default_timeline: str,
@@ -138,9 +139,6 @@ def html_person_options(default_timeline: str,
     options_str = \
         html_header_with_external_style(css_filename, instance_title, None)
 
-    options_str += html_keyboard_navigation(text_mode_banner, {}, {})
-    options_str += '<br><br>\n'
-
     # show banner
     banner_file, _ = \
         get_banner_file(base_dir, nickname, domain, theme)
@@ -155,6 +153,16 @@ def html_person_options(default_timeline: str,
         'src="/users/' + nickname + '/' + banner_file + '" /></a>\n' + \
         '</header>\n<br><br>\n'
 
+    nav_links = {}
+    timeline_link_str = html_hide_from_screen_reader('🏠') + ' ' + \
+        translate['Switch to timeline view']
+    nav_links[timeline_link_str] = \
+        '/users/' + nickname + '/' + default_timeline
+    nav_access_keys = {
+    }
+    options_str += \
+        html_keyboard_navigation(text_mode_banner, nav_links, nav_access_keys)
+
     options_str += '<div class="options">\n'
     options_str += '  <div class="optionsAvatar">\n'
     options_str += '  <center>\n'