Index: HTML/Default/cmdwrappers
===================================================================
--- HTML/Default/cmdwrappers	(revision 5495)
+++ HTML/Default/cmdwrappers	(working copy)
@@ -123,9 +123,12 @@
 		[% END %]
 		</span>
 
-		<span class="exboldnowplaying"></span>
-
+		[% IF item.currentsong %]
+		<a name="currentsong"></a>
+		<span class="exboldlisting">
+		[% ELSE %]
 		<span class="exlisting">
+		[% END %]
 		[% IF item.includeAlbum && item.album && item.album != item.noAlbum %]
 
 			[% "FROM" | string %]