When hovering over the "Editor Type" button it always shows Shift-F1 as the shortcut no matter what the current Editor Type is. We already have specific code for "SCREEN_OT_space_type_set_or_cycle" for the items on the popup menu, but it doesn't handle the case of hovering the menu itself. This adds just adds a line to handle this. Pull Request: https://projects.blender.org/blender/blender/pulls/132612