diff --git a/Canvas.js b/Canvas.js
index be1c4f70d..d74198e6a 100644
--- a/Canvas.js
+++ b/Canvas.js
@@ -884,36 +884,45 @@ function newCanvas () {
             y: dragVector.upY - dragVector.downY
           }
 
-          if (viewPortBeingDragged) {
-            canvas.chartSpace.viewport.displace(displaceVector)
-          }
+          canvas.chartSpace.viewport.displace(displaceVector)
         }
         if (containerDragStarted) {
           if (containerBeingDragged !== undefined) {
-            let downCopy = {
-              x: dragVector.downX,
-              y: dragVector.downY
-            }
+            if (containerBeingDragged.space === 'Charting Space') {
+              let downCopy = {
+                x: dragVector.downX,
+                y: dragVector.downY
+              }
 
-            let downNoZoom
-            downNoZoom = canvas.chartSpace.viewport.unTransformThisPoint(downCopy)
+              let downNoZoom
+              downNoZoom = canvas.chartSpace.viewport.unTransformThisPoint(downCopy)
 
-            let upCopy = {
-              x: dragVector.upX,
-              y: dragVector.upY
-            }
+              let upCopy = {
+                x: dragVector.upX,
+                y: dragVector.upY
+              }
 
-            let upNoZoom
-            upNoZoom = canvas.chartSpace.viewport.unTransformThisPoint(upCopy)
+              let upNoZoom
+              upNoZoom = canvas.chartSpace.viewport.unTransformThisPoint(upCopy)
 
-            displaceVector = {
-              x: upNoZoom.x - downNoZoom.x,
-              y: upNoZoom.y - downNoZoom.y
-            }
+              displaceVector = {
+                x: upNoZoom.x - downNoZoom.x,
+                y: upNoZoom.y - downNoZoom.y
+              }
 
-            let moveSucceed = containerBeingDragged.displace(displaceVector)
-            if (moveSucceed === false) {
-              deactivateDragging(event)
+              let moveSucceed = containerBeingDragged.displace(displaceVector)
+              if (moveSucceed === false) {
+                deactivateDragging(event)
+              }
+            } else {
+              let displaceVector = {
+                x: dragVector.upX - dragVector.downX,
+                y: dragVector.upY - dragVector.downY
+              }
+              let moveSucceed = containerBeingDragged.displace(displaceVector)
+              if (moveSucceed === false) {
+                deactivateDragging(event)
+              }
             }
           }
         }
diff --git a/Spaces/ChartSpace.js b/Spaces/ChartSpace.js
index 44c85fe49..3636bd1bc 100644
--- a/Spaces/ChartSpace.js
+++ b/Spaces/ChartSpace.js
@@ -142,9 +142,13 @@ function newChartSpace () {
         }
       }
     }
-    if (containerFound !== undefined) { return containerFound }
+    if (containerFound !== undefined) {
+      containerFound.space = 'Charting Space'
+      return containerFound
+    }
 
     if (thisObject.container.frame.isThisPointHere(point, true) === true) {
+      thisObject.container.space = 'Charting Space'
       return thisObject.container
     } else {
       return undefined
diff --git a/Spaces/CockpitSpace.js b/Spaces/CockpitSpace.js
index e7ac6a068..e866d859d 100644
--- a/Spaces/CockpitSpace.js
+++ b/Spaces/CockpitSpace.js
@@ -173,6 +173,7 @@
      // if (container !== undefined) { return container }
 
      if (thisObject.container.frame.isThisPointHere(point, true) === true) {
+       thisObject.container.space = 'Cockpit Space'
        return thisObject.container
      } else {
        return undefined
diff --git a/Spaces/DesignerSpace.js b/Spaces/DesignerSpace.js
index add5dd2f2..bf6a78ee5 100644
--- a/Spaces/DesignerSpace.js
+++ b/Spaces/DesignerSpace.js
@@ -280,7 +280,10 @@ function newDesignerSpace () {
 
     if (thisObject.sidePanel !== undefined) {
       container = thisObject.sidePanel.getContainer(point)
-      if (container !== undefined) { return container }
+      if (container !== undefined) {
+        container.space = 'Designer Space'
+        return container
+      }
     }
 
     return
diff --git a/Spaces/FloatingSpace.js b/Spaces/FloatingSpace.js
index 0737e8ed0..bd84fd983 100644
--- a/Spaces/FloatingSpace.js
+++ b/Spaces/FloatingSpace.js
@@ -237,9 +237,13 @@ function newFloatingSpace () {
     let container
 
     container = thisObject.floatingLayer.getContainer(point)
-    if (container !== undefined) { return container }
+    if (container !== undefined) {
+      container.space = 'Floating Space'
+      return container
+    }
 
     if (visible === true) {
+      thisObject.container.space = 'Floating Space'
       return thisObject.container
     }
   }
diff --git a/Spaces/PanelsSpace.js b/Spaces/PanelsSpace.js
index efe7e03b9..6efa86a7a 100644
--- a/Spaces/PanelsSpace.js
+++ b/Spaces/PanelsSpace.js
@@ -343,9 +343,11 @@ function newPanelsSpace () {
         }
       }
       if (container !== undefined) {
+        container.space = 'Panels Space'
         return container
       }
     }
+    thisObject.container.space = 'Panels Space'
     return thisObject.container
   }
 }
diff --git a/Spaces/TopSpace.js b/Spaces/TopSpace.js
index 8ed4149c4..ff1b7786f 100644
--- a/Spaces/TopSpace.js
+++ b/Spaces/TopSpace.js
@@ -50,18 +50,7 @@ function newTopSpace () {
   }
 
   function getContainer (point) {
-    let container
-    return
 
-    container = thisObject.currentEvent.getContainer(point)
-    if (container !== undefined) { return container }
-
-    container = thisObject.login.getContainer(point)
-    if (container !== undefined) { return container }
-
-        /* The point does not belong to any inner container, so we return the current container. */
-
-    return thisObject.container
   }
 
   function draw () {