diff --git a/javascript/src/Helper/codemirror.js b/javascript/src/Helper/codemirror.js
index 74902794c5057167035c2a96f86c5915d6e196c2..46a2c8fc29f615e6eb59158ed2394798cbd3cd5c 100644
--- a/javascript/src/Helper/codemirror.js
+++ b/javascript/src/Helper/codemirror.js
@@ -108,6 +108,11 @@ $(document).ready(function(){
     var urlParams = new URLSearchParams(window.location.search);
     var ttContentParam = urlParams.get('tt-content');
     var pageId = urlParams.get('id');
+    if(pageId === null){
+        pageId = '';
+    }else{
+        pageId = 'id='+pageId+'&';
+    }
 
     if(ttContentParam !== null && $(targetEditReportButton).next("#"+ttContentParam)[0] !== undefined){
         var formContent = $($(targetEditReportButton).next("#"+ttContentParam)[0].outerHTML);
@@ -117,18 +122,23 @@ $(document).ready(function(){
     // execute changes(post) and reload page with id of tt-content as get parameter. Staying in same window with new content.
     $(externWindow).submit(function() {
         $.post($(externWindow).attr('action'),$(externWindow).serializeArray());
-        alert("Changes have been saved. Reload your primary window after that.");
-        if(pageId === null){
-            pageId = '';
-        }else{
-            pageId = 'id='+pageId+'&';
-        }
-        if(window.location.search !== '?'+"tt-content="+$('form').attr('id')){
+        $('<div style="text-align: right; margin-top: 10px;"><span style="background-color: green;" class="badge badge-success">Saved</span></div>')
+            .insertAfter('.btn-default')
+            .delay(3000)
+            .fadeOut(function() {
+                $(this).remove();
+            });
+        if(window.location.search !== '?'+pageId+"tt-content="+$('form').attr('id')){
             window.location.href = '//' + location.host + location.pathname + "?" +pageId+ "tt-content=" + $('form').attr('id');
         }
         return false;
     });
 
+    // Refresh new window with correct url
+    if($(externWindow).length !== 0 && window.location.search !== '?'+pageId+"tt-content="+$('form').attr('id')){
+        window.location.href = '//' + location.host + location.pathname + "?" +pageId+ "tt-content=" + $('form').attr('id');
+    }
+
     // enable CodeMirror for extern window
     $(externWindow).children("[class=qfq-codemirror]").each(
         function () {