diff --git a/beetsplug/web/templates/index.html b/beetsplug/web/templates/index.html
index a290a952e..fe88a20ad 100644
--- a/beetsplug/web/templates/index.html
+++ b/beetsplug/web/templates/index.html
@@ -39,7 +39,11 @@
         <div id="extra-detail"></div>
         <!-- Templates. -->
         <script type="text/template" id="item-entry-template">
-            <%= artist %> &ndash; <%= album %> &ndash; <%= title %>
+            <% if (artist) { %><%= artist %><% } %>
+            <% if (artist && album) { %> &ndash; <% } %>
+            <% if (album) { %><%= album %><% } %>
+            <% if ((artist || album) && title) { %> &ndash; <% } %>
+            <%= title %>
             <span class="playing">&#9654;</span>
         </script>
         <script type="text/template" id="item-main-detail-template">