Index: /work/xwiki/curriki/gwt/src/main/java/org/curriki/gwt/client/widgets/currikiitem/display/ItemDisplay.java
===================================================================
--- /work/xwiki/curriki/gwt/src/main/java/org/curriki/gwt/client/widgets/currikiitem/display/ItemDisplay.java	(revision 6198)
+++ /work/xwiki/curriki/gwt/src/main/java/org/curriki/gwt/client/widgets/currikiitem/display/ItemDisplay.java	(working copy)
@@ -207,6 +207,10 @@
                     if (Window.confirm(Main.getTranslation("asset.asset_locked_force_edit"))){
                         switchToEdit(true);
                     }
+                    else
+                    {
+                    	cancelEditMode();
+                    }
                 }
 
             }
Index: /work/xwiki/curriki/gwt/src/main/java/org/curriki/gwt/client/widgets/currikiitem/display/TextItemDisplay.java
===================================================================
--- /work/xwiki/curriki/gwt/src/main/java/org/curriki/gwt/client/widgets/currikiitem/display/TextItemDisplay.java	(revision 6198)
+++ /work/xwiki/curriki/gwt/src/main/java/org/curriki/gwt/client/widgets/currikiitem/display/TextItemDisplay.java	(working copy)
@@ -59,7 +59,8 @@
     private native String addMCEControl(Element e, String imagepath, String attachpath) /*-{
           $wnd.tinyMCE.settings["wiki_images_path"] = imagepath;
           $wnd.tinyMCE.settings["wiki_attach_path"] = attachpath;
-          return $wnd.tinyMCE.addMCEControl(e, e.id);
+          var elemid = e.id ? e.id : e.name;
+          return $wnd.tinyMCE.addMCEControl(e, elemid);
           // $wnd.tinyMCE.settings["wiki_images_path"] = imagepath;
           // $wnd.tinyMCE.settings["wiki_attach_path"] = attachpath;
       }-*/;
@@ -94,7 +95,7 @@
                     super.onSuccess(object);
                     if (object!=null) {
                         wysiwyghtml = object.toString();
-                        Window.alert(wysiwyghtml);
+                        //Window.alert(wysiwyghtml);
                         initVerbatim(text);
                     }
                 }
@@ -112,7 +113,7 @@
         String imagepath = "/xwiki/bin/download/" + getDocumentFullName().replace('.', '/') + "/";
         String attachpath = "/xwiki/bin/view/" + getDocumentFullName().replace('.', '/');
         tinyMCEId = addMCEControl(textarea.getElement(), imagepath, attachpath);
-        Main.getSingleton().getEditor().ensureVisibleWidget(textarea);
+        //Main.getSingleton().getEditor().ensureVisibleWidget(textarea);
         // }
     }
 
@@ -229,6 +230,10 @@
                     if (Window.confirm(Main.getTranslation("asset.asset_locked_force_edit"))){
                         switchToEdit(true);
                     }
+                    else
+                    {
+                    	cancelEditMode();
+                    }
                 }
             }
         });
@@ -250,7 +255,11 @@
     public void onWindowResized(int i, int i1) {
         if ((textarea!=null)&&(status == Constants.EDIT)) {
             String text = getContent();
-            panel.remove(0);
+            try{
+            	panel.remove(0);
+            }catch(Exception e){ 
+            	//do nothing. should not remove anything, but it would be ready for init
+            }
             initVerbatim(text);
         }
     }