--- a/integration/js/editor.js	Mon Dec 03 16:00:01 2012 +0100
+++ b/integration/js/editor.js	Tue Dec 04 13:31:01 2012 +0100
@@ -46,7 +46,9 @@
         ),
         mashupstatus = '',
         mediasegmentscache = {},
-        addMode, currentMedia, currentSegment;
+        mashupModeAfterSave = false,
+        addMode = false,
+        currentMedia, currentSegment;
         
     IriSP.mashupcore(project, mashup);
     
@@ -521,10 +523,14 @@
             mashup.trigger("change");
             var segment = mashup.getAnnotation(currentSegment);
             currentSegment = undefined;
-            setMedia(mashup);
-            if (segment) {
-                mashup.setCurrentTime(segment.begin);
-                mashup.trigger("enter-annotation",segment);
+            if (mashupModeAfterSave) {
+                setMedia(mashup);
+                if (segment) {
+                    mashup.setCurrentTime(segment.begin);
+                    mashup.trigger("enter-annotation",segment);
+                }
+            } else {
+                
             }
         }
         return false;
@@ -626,6 +632,7 @@
         var currentItem = $(this).parents(".item-video"),
             media = project.getElement(currentItem.attr("data-media-id")),
             segment = project.getElement(currentItem.attr("data-segment-id"));
+        mashupModeAfterSave = !!(currentMedia === mashup);
         currentSegment = segment;
         setMedia(media);
         return false;
@@ -731,6 +738,7 @@
     
     $(".mashup-description .edit").click(function() {
         if (mashup.currentAnnotation) {
+            mashupModeAfterSave = !!(currentMedia === mashup);
             currentSegment = mashup.currentAnnotation.annotation;
             setMedia(mashup.currentAnnotation.getMedia());
         }