diff --git a/daemon.py b/daemon.py
index b6c63bf77..7437feb4f 100644
--- a/daemon.py
+++ b/daemon.py
@@ -11154,7 +11154,8 @@ class PubServer(BaseHTTPRequestHandler):
                                nickname, self.server.domain,
                                self.server.translate,
                                accessKeys,
-                               self.server.accessKeys)
+                               self.server.accessKeys,
+                               self.server.defaultTimeline)
             msg = msg.encode('utf-8')
             msglen = len(msg)
             self._login_headers('text/html', msglen, callingDomain)
diff --git a/webapp_accesskeys.py b/webapp_accesskeys.py
index d72d2a3e3..3efd1440e 100644
--- a/webapp_accesskeys.py
+++ b/webapp_accesskeys.py
@@ -36,7 +36,8 @@ def loadAccessKeysForAccounts(baseDir: str, keyShortcuts: {}) -> None:
 def htmlAccessKeys(cssCache: {}, baseDir: str,
                    nickname: str, domain: str,
                    translate: {}, accessKeys: {},
-                   defaultAccessKeys: {}) -> str:
+                   defaultAccessKeys: {},
+                   defaultTimeline: str) -> str:
     """Show and edit key shortcuts
     """
     accessKeysFilename = \
@@ -63,9 +64,12 @@ def htmlAccessKeys(cssCache: {}, baseDir: str,
         '/users/' + nickname + '/changeAccessKeys">\n'
 
     accessKeysForm += \
-        '    <center>' + \
-        '<button type="submit" class="button" name="submitAccessKeys">' + \
-        translate['Submit'] + '</button></center>\n'
+        '    <center>\n' + \
+        '      <a href="/users/' + nickname + '/' + defaultTimeline + '">' + \
+        '<button class="cancelbtn">' + \
+        translate['Go Back'] + '</button></a>\n' + \
+        '    <button type="submit" class="button" name="submitAccessKeys">' + \
+        translate['Submit'] + '</button>\n    </center>\n'
 
     accessKeysForm += '    <table class="accesskeys">\n'
     accessKeysForm += '      <colgroup>\n'