diff --git a/app/coffee/modules/wiki/main.coffee b/app/coffee/modules/wiki/main.coffee
index 1170e04d..0db130a4 100644
--- a/app/coffee/modules/wiki/main.coffee
+++ b/app/coffee/modules/wiki/main.coffee
@@ -255,7 +255,7 @@ $qqueue, $repo, $analytics, wikiHistoryService) ->
             return if not value
             $scope.item = value
             $scope.version = value.version
-            $scope.storageKey = $scope.project.id + "-" + value.id + "-" + $attrs.type
+            $scope.storageKey = $scope.project.id + "-" + value.id + "-wiki" 
 
         $scope.$watch 'project', (project) ->
             return if !project
diff --git a/app/modules/components/wysiwyg/wysiwyg.directive.coffee b/app/modules/components/wysiwyg/wysiwyg.directive.coffee
index 1ef63345..936f2cbe 100644
--- a/app/modules/components/wysiwyg/wysiwyg.directive.coffee
+++ b/app/modules/components/wysiwyg/wysiwyg.directive.coffee
@@ -56,7 +56,7 @@ Medium = ($translate, $confirm, $storage, wysiwygService, animationFrame, tgLoad
         pre.parentNode.replaceChild(p, pre)
         mediumInstance.checkContentChanged(mediumInstance.elements[0])
 
-    addCodeBlockAndHightlight = (range, elm) ->
+    addCodeBlockAndHightlight = (range, mediumInstance) ->
         pre = document.createElement('pre')
         code = document.createElement('code')
 
@@ -73,7 +73,8 @@ Medium = ($translate, $confirm, $storage, wysiwygService, animationFrame, tgLoad
 
         start.parentNode.insertBefore(pre, start)
 
-        refreshCodeBlocks(elm)
+        refreshCodeBlocks(mediumInstance)
+        mediumInstance.checkContentChanged(mediumInstance.elements[0])
 
     refreshCodeBlocks = (mediumInstance) ->
         return if !mediumInstance
@@ -104,8 +105,6 @@ Medium = ($translate, $confirm, $storage, wysiwygService, animationFrame, tgLoad
 
                 pre.parentNode.insertBefore(p, pre.nextSibling)
 
-        mediumInstance.checkContentChanged(mediumInstance.elements[0])
-
     AlignRightButton = MediumEditor.extensions.button.extend({
         name: 'rtl',
         init: () ->
@@ -297,6 +296,7 @@ Medium = ($translate, $confirm, $storage, wysiwygService, animationFrame, tgLoad
             discardLocalStorage()
             mediumInstance.trigger('blur', {}, editorMedium[0])
             $scope.outdated = false
+            refreshCodeBlocks(mediumInstance)
 
             $scope.onCancel()