diff --git a/source/blender/windowmanager/intern/wm_keymap_utils.cc b/source/blender/windowmanager/intern/wm_keymap_utils.cc index 07f3fdc3875..be2d292596c 100644 --- a/source/blender/windowmanager/intern/wm_keymap_utils.cc +++ b/source/blender/windowmanager/intern/wm_keymap_utils.cc @@ -406,10 +406,21 @@ wmKeyMap *WM_keymap_guess_opname(const bContext *C, const char *opname) default: break; } + + if (ARegion *region = CTX_wm_region(C)) { + /* When property is in side panel, add shortcut key to User interface Keymap, see: #136998. + */ + if (region->regiontype == RGN_TYPE_UI) { + km = WM_keymap_find_all(wm, "User Interface", SPACE_EMPTY, RGN_TYPE_WINDOW); + } + } if (km && !WM_keymap_poll((bContext *)C, km)) { km = nullptr; } } + else if (sl->spacetype == SPACE_PROPERTIES) { + km = WM_keymap_find_all(wm, "User Interface", SPACE_EMPTY, RGN_TYPE_WINDOW); + } if (!km) { km = WM_keymap_find_all(wm, "Animation", SPACE_EMPTY, RGN_TYPE_WINDOW);