Improved $ button fix

Still had problems with last fix. This one reverted the last fix and
tried another. Seems to work quite well.

This reverts commit 1211022765c8f5080267e65a4939f10c9918c6c6.