diff --git a/AppSchema.json b/AppSchema.json
index 37b2cd8ad..8df269763 100644
--- a/AppSchema.json
+++ b/AppSchema.json
@@ -4953,7 +4953,7 @@
             "config": true
         },
         "initialValues": {
-            "code": "{ \n\"codeName\": \"Write here the name of the market as it is defined at the CCXT library.\"\n}"
+            "code": "{ \n\"codeName\": \"Write here the name of the market.\"\n}"
         },
         "chainAttachesTo": {
             "compatibleTypes": "->Exchange Markets->"
diff --git a/CanvasApp/Canvas.js b/CanvasApp/Canvas.js
index 975aa841b..70bda0737 100644
--- a/CanvasApp/Canvas.js
+++ b/CanvasApp/Canvas.js
@@ -616,6 +616,12 @@ function newCanvas () {
         containerDragStarted = true
         floatingObjectDragStarted = true
         containerBeingDragged.eventHandler.raiseEvent('onDragStarted', point)
+
+        if (event.candelDragging === true) {
+          containerBeingDragged = undefined
+          containerDragStarted = false
+          floatingObjectDragStarted = false
+        }
         return
       }
 
diff --git a/CanvasApp/Spaces/FloatingSpace.js b/CanvasApp/Spaces/FloatingSpace.js
index 706b571ba..f04a22767 100644
--- a/CanvasApp/Spaces/FloatingSpace.js
+++ b/CanvasApp/Spaces/FloatingSpace.js
@@ -140,10 +140,13 @@ function newFloatingSpace () {
   function onDragStarted (event) {
     if (thisObject.inMapMode === false) {
       if (event.buttons !== 2) { return }
-
+      event.candelDragging = true
       enterMapMode()
     } else {
-      if (event.buttons !== 1) { return }
+      if (event.buttons !== 1) {
+        event.candelDragging = true
+        return
+      }
 
       let mousePosition = {
         x: event.x,