Cherry-pick 'Fix the tooltip display in the repository module (see #5540)'