Not sure this is the best fix, but this should be working. Regardless it seems good to tag active tool keymaps as such.