Better fix Android bug without breaking skinny desktop