diff --git a/app/coffee/modules/common/history.coffee b/app/coffee/modules/common/history.coffee
index c10ee9fd..ead7a6a8 100644
--- a/app/coffee/modules/common/history.coffee
+++ b/app/coffee/modules/common/history.coffee
@@ -440,6 +440,7 @@ HistoryDirective = ($log, $loading) ->
 
         $el.on "click", ".add-comment a.button-green", debounce 2000, (event) ->
             event.preventDefault()
+            $scope.$broadcast("markdown-editor:submit")
 
             target = angular.element(event.currentTarget)
 
diff --git a/app/coffee/modules/common/wisiwyg.coffee b/app/coffee/modules/common/wisiwyg.coffee
index 24a45b54..3e39fc0f 100644
--- a/app/coffee/modules/common/wisiwyg.coffee
+++ b/app/coffee/modules/common/wisiwyg.coffee
@@ -69,8 +69,15 @@ tgMarkitupDirective = ($rootscope, $rs) ->
         element = angular.element($el)
         previewDomNode = $("<div/>", {class: "preview"})
 
-        openHelp = ->
-            window.open($rootscope.urls.wikiHelpUrl(), '_blank')
+        #openHelp = ->
+        #    window.open($rootscope.urls.wikiHelpUrl(), '_blank')
+
+        closePreviewMode = ->
+            element.parents(".markdown").find(".preview").remove()
+            element.parents(".markItUp").show()
+
+        $scope.$on "markdown-editor:submit", ->
+            closePreviewMode()
 
         preview = ->
             markdownDomNode = element.parents(".markdown")
@@ -83,8 +90,7 @@ tgMarkitupDirective = ($rootscope, $rs) ->
                 # function is better aproach for it
                 element.parents(".markdown").one "click", ".preview", (event) ->
                     event.preventDefault()
-                    markdownDomNode.find(".preview").remove()
-                    markItUpDomNode.show()
+                    closePreviewMode()
 
         markdownCaretPositon = false