Fixes defaultButton assignment