diff --git a/source/java/org/alfresco/web/forms/xforms/XFormsProcessor.java b/source/java/org/alfresco/web/forms/xforms/XFormsProcessor.java
index 30f5bef6fc..e56aa823e1 100644
--- a/source/java/org/alfresco/web/forms/xforms/XFormsProcessor.java
+++ b/source/java/org/alfresco/web/forms/xforms/XFormsProcessor.java
@@ -213,7 +213,8 @@ public class XFormsProcessor implements FormProcessor
       js.append("alfresco.constants.AVM_WEBAPP_URL = '");
       if (avmWebApp != null)
       {
-         String storeName = avmBrowseBean.getSandbox();
+         //Use preview store because when user upload image it appears in preview, not in main store.
+         String storeName = AVMUtil.getCorrespondingPreviewStoreName(avmBrowseBean.getSandbox());
          if (storeName != null)
          {
             js.append(JavaScriptUtils.javaScriptEscape(fc.getExternalContext().getRequestContextPath() + "/wcs/api/path/content/avm/" +
diff --git a/source/web/scripts/ajax/tiny_mce_wcm_extensions.js b/source/web/scripts/ajax/tiny_mce_wcm_extensions.js
index fb5d268065..b6f58cc3af 100644
--- a/source/web/scripts/ajax/tiny_mce_wcm_extensions.js
+++ b/source/web/scripts/ajax/tiny_mce_wcm_extensions.js
@@ -41,7 +41,8 @@ function alfresco_TinyMCE_urlconverter_callback(href, element, onsave)
   {
     if (href.startsWith(alfresco.constants.AVM_WEBAPP_URL))
     {
-      result = href.substring(alfresco.constants.AVM_WEBAPP_URL.length);
+      //do nothin. AVM_WEBAPP_URL will be removed during saving image in _tinyMCE_blurHandler
+      result = href;
     }
     else if (href.startsWith("/"))
     {
diff --git a/source/web/scripts/ajax/xforms.js b/source/web/scripts/ajax/xforms.js
index c86182aa87..07a886e0b1 100644
--- a/source/web/scripts/ajax/xforms.js
+++ b/source/web/scripts/ajax/xforms.js
@@ -933,7 +933,7 @@ alfresco.xforms.RichTextEditor = alfresco.xforms.Widget.extend({
     tinyMCE.execCommand("mceAddControl", false, this.widget.id)
     var editorDocument = tinyMCE.get(this.widget.id).getDoc();
     editorDocument.widget = this;
-    tinymce.dom.Event.add(editorDocument,window.ie ? "beforedeactivate" : "blur", 
+    tinymce.dom.Event.add(editorDocument,window.ie ? "mouseout" : "blur", 
                      this._tinyMCE_blurHandler);
     tinymce.dom.Event.add(editorDocument, "focus", this._tinyMCE_focusHandler);
     this._created = true;
@@ -1052,7 +1052,7 @@ alfresco.xforms.RichTextEditor = alfresco.xforms.Widget.extend({
 
   _tinyMCE_blurHandler: function(event)
   {
-    if (event.type == "beforedeactivate")
+    if (event.type == "mouseout")
     {
       event.target = event.srcElement.ownerDocument;
     }