Fix update to button issue

fixes #9560

please review @karlitschek @PVince81