diff --git a/lisp/mastodon-discover.el b/lisp/mastodon-discover.el
index a7fcb373..7b696808 100644
--- a/lisp/mastodon-discover.el
+++ b/lisp/mastodon-discover.el
@@ -48,19 +48,19 @@
                        ("b" "Boost" mastodon-toot--boost)
                        ("c" "Toggle content" mastodon-tl--toggle-spoiler-text-in-toot)
                        ("f" "Favourite" mastodon-toot--favourite)
-                       ("j" "Next" mastodon-tl--goto-next-toot)
-                       ("k" "Prev" mastodon-tl--goto-prev-toot)
-                       ("n" "Send" mastodon-toot)
+                       ("n" "Next" mastodon-tl--goto-next-toot)
+                       ("p" "Prev" mastodon-tl--goto-prev-toot)
+                       ("t" "Toot" mastodon-toot)
                        ("r" "Reply" mastodon-toot--reply)
-                       ("t" "Thread" mastodon-tl--thread)
                        ("u" "Update" mastodon-tl--update)
-                       ("U" "Users" mastodon-profile--show-user))
+                       ("P" "Users" mastodon-profile--show-user)
+                       ("T" "Thread" mastodon-tl--thread))
                       ("Timelines"
+                       ("#" "Tag" mastodon-tl--get-tag-timeline)
                        ("F" "Federated" mastodon-tl--get-federated-timeline)
                        ("H" "Home" mastodon-tl--get-home-timeline)
                        ("L" "Local" mastodon-tl--get-local-timeline)
-                       ("N" "Notifications" mastodon-notifications--get)
-                       ("T" "Tag" mastodon-tl--get-tag-timeline))
+                       ("N" "Notifications" mastodon-notifications--get))
                       ("Quit"
                        ("q" "Quit mastodon buffer. Leave window open." kill-this-buffer)
                        ("Q" "Quit mastodon buffer and kill window." kill-buffer-and-window)))))))