--- a/integration/js/mashupcore.js	Wed Nov 28 12:19:21 2012 +0100
+++ b/integration/js/mashupcore.js	Wed Nov 28 15:42:16 2012 +0100
@@ -276,7 +276,6 @@
         mashupSegmentEnd = mashup.currentAnnotation.annotation.end.milliseconds;
         mashupTimedelta = mashupSegmentBegin - mashup.currentAnnotation.begin.milliseconds;
         mashup.currentMedia = mashup.currentAnnotation.getMedia();
-        
         project.getMedias().forEach(function(_media) {
             if (_media !== mashup.currentMedia) {
                 _media.hide();
@@ -484,7 +483,7 @@
         });
         
         project.on("set-current", function(_m) {
-            if (_m !== media) {
+            if (_m !== media && (_m !== mashup || mashup.currentMedia !== media)) {
                 media.hide();
             }
         });