Git stage vs rollback UI too risky, accidental rollback when stage was intended

I just had to deal with accidentally clicking "Rollback" instead of "Stage" in the popup menu when right clicking on the "Unstaged" changes in the Commit tool because they are next to each other. There was no confirmation before all the changes were rolled back.  The keyboard shortcuts are also next to each other, A and Z.  I think placing such commands next to each other is too risky since rolling back is so destructive when a user is trying to do the exact opposite.

I couldn't figure out how to undo what I did in the IDE. I used the shell to find files that were just changed, went to each file, and did a "Revert" in the local history of the file. Luckily I didn't have many files to deal with.

I also looked for a setting to force a confirmation before rolling back but I didn't find one. Is there such an option?

I really think these commands should not be next to each other even if they are used frequently, especially if a rollback can't be easily undone or a confirmation can't be turned on.

Other than not making such an accident, is there a way to prevent this from happening again that I am not noticing?