This becomes a problem in other languages, such as German
and Spanish, which have longer strings.

A downside of this patch is that the options no longer look
aligned when you switch tabs.

Change-Id: Iffb49d5411cc655bd16b78a9470da7dc661077ca