diff --git a/app/src/components/drop-zone.tsx b/app/src/components/drop-zone.tsx
index 3418dac01..cd1b8fa33 100644
--- a/app/src/components/drop-zone.tsx
+++ b/app/src/components/drop-zone.tsx
@@ -75,7 +75,13 @@ export class DropZone extends React.Component<DropZoneProps> {
       <div
         {...otherProps}
         onDragOver={event => {
-          event.dataTransfer.dropEffect = 'copy';
+          if (event.target instanceof HTMLElement && event.target.closest('[data-slate-editor]'))
+            return;
+          if (event.dataTransfer.effectAllowed) {
+            event.dataTransfer.dropEffect = event.dataTransfer.effectAllowed;
+          } else {
+            event.dataTransfer.dropEffect = 'copy';
+          }
           event.preventDefault();
         }}
         onDragEnter={this._onDragEnter}
diff --git a/app/src/window-event-handler.ts b/app/src/window-event-handler.ts
index e115ad6b2..1c77cc5b9 100644
--- a/app/src/window-event-handler.ts
+++ b/app/src/window-event-handler.ts
@@ -248,10 +248,6 @@ export default class WindowEventHandler {
     event.stopPropagation();
   };
 
-  onDragOver = (event: DragEvent) => {
-    event.dataTransfer.dropEffect = 'none';
-  };
-
   resolveHref(el: EventTarget) {
     if (!el || !(el instanceof HTMLElement)) {
       return null;