Merge branch 'refs/heads/master' into CSSPanelUpdates

1 files changed, 3 insertions, 1 deletions

diff --git a/js/panels/drag-drop-composer.js b/js/panels/drag-drop-composer.js
index b36c8334..4791bd6d 100644
--- a/js/panels/drag-drop-composer.js
+++ b/js/panels/drag-drop-composer.js
@@ -91,7 +91,9 @@ exports.DragDropComposer = Montage.create(Composer, {
             e.stopImmediatePropagation();
             if (!this._dragover) {
                 this._dragover = true;
-                this.component.element.classList.add("dragOver");
+                if (this.component.application.ninja.componentBeingDragged) {
+                    this.component.element.classList.add("dragOver");
+                }
             }
         }
     },