diff --git a/modules/overlay/overlay-child.css b/modules/overlay/overlay-child.css
index 0ee699c..ea0d045 100644
--- a/modules/overlay/overlay-child.css
+++ b/modules/overlay/overlay-child.css
@@ -44,6 +44,9 @@ html.js body {
   font-size: 20px;
   margin: 0;
   padding: 0.3em 0;
+  /* Let the #overlay-title wrap, but not the other #overlay-titlebar items. */
+  white-space: normal;
+  line-height: 135%;
 }
 #overlay-title:active,
 #overlay-title:focus {
@@ -125,6 +128,9 @@ html.js body {
  */
 #overlay-titlebar .add-or-remove-shortcuts {
   padding-top: 0.9em;
+  /* Leave a little space between the #overlay-titlebar and #overlay-content when
+  the title is so long that it wraps onto multiple lines. */
+  margin-bottom: 0.6em;
 }
 
 /**