diff --git a/beetsplug/web/static/beets.css b/beetsplug/web/static/beets.css
index 7476502da..a3d8d9760 100644
--- a/beetsplug/web/static/beets.css
+++ b/beetsplug/web/static/beets.css
@@ -105,11 +105,22 @@ body {
     font-style: italic;
 }
 
+#detail div {
+    height: 90%;
+}
+
+#detail dl {
+    overflow-x: hidden;
+    overflow-y: auto;
+    height: inherit;
+}
+
 #detail dl dt, #detail dl dd {
     list-style: none;
     margin: 0;
     padding: 0;
 }
+
 #detail dl dt {
     width: 10em;
     float: left;
@@ -121,6 +132,7 @@ body {
     margin-left: 10.5em;
 }
 
+
 #player {
     float: left;
     width: 150px;
diff --git a/beetsplug/web/templates/index.html b/beetsplug/web/templates/index.html
index 7a1b3e02e..8fd57809a 100644
--- a/beetsplug/web/templates/index.html
+++ b/beetsplug/web/templates/index.html
@@ -80,7 +80,8 @@
                 </dd>
                 <% if (lyrics) { %>
                     <dt>Lyrics</dt>
-                    <dd><%= lyrics %></dd>
+                    <dd><%= lyrics.replace(/
+/g,'<br />') %></dd>
                 <% } %>
                 <% if (comments) { %>
                     <dt>Comments</dt>