Manual handbrake on Octavia 3 safety issue

Hello

As some of you might be aware, handbrake release button on Octavia mk3 (also vw and seat) has issues

with wearing out and popping off the handbrake. That normally would not be a big issue but for some reason

this button unlike on other makers does not only release the handbrake but it actually keeps it in place too.

The little bit of plastic which tends to wear out, keeps the handbrake in place and if breaking, will immediately disengage

the handbrake.

My question is if anyone has found a way to retrofit a safer aftermarket variant or one from another car that doesn't have this

issue? I park in front of my garage on a steep incline daily to open the door. Now luckily when it popped off, it was not there, but

95% of time I apply it on that steep incline so I'd probably get hurt.

cheers