diff --git a/src/components/dock/dock.ts b/src/components/dock/dock.ts
index 79dde29..543dc84 100644
--- a/src/components/dock/dock.ts
+++ b/src/components/dock/dock.ts
@@ -627,6 +627,7 @@ export default class StarDock extends StarBaseElement {
       this._dnd.child.container.classList.remove('dragging')
     }
 
+    this._dragChild = undefined
     this.synchronise()
   }
 
diff --git a/src/components/grid-container/container.ts b/src/components/grid-container/container.ts
index c4f9d0a..c0d000d 100644
--- a/src/components/grid-container/container.ts
+++ b/src/components/grid-container/container.ts
@@ -2527,7 +2527,7 @@ export class GaiaContainer extends StarBaseElement {
 
       const elementHeight = this._dnd.child.element.offsetHeight
       const elementWidth = this._dnd.child.element.offsetWidth
-      if (centerY > this.offsetHeight) {
+      if (centerY > this.offsetHeight + this.top) {
         this.dragPosition = 'outter'
         if (!this.throttle) {
           this.throttle = window.setTimeout(() => {