Fix differentiation between text and submit buttons in universal
dispatch too.