FLEX-34373 - fix default button handling

Signed-off-by: Erik de Bruin <erik@ixsoftware.nl>