Fix #11400 and #11431

This isn't the best solution, but that's CSS.