A fix for issue #385

For realz this time. Complete overhaul of how that button works