diff --git a/src/Widgets/WindowClone.vala b/src/Widgets/WindowClone.vala
index f3d13c015..8a8bf0024 100644
--- a/src/Widgets/WindowClone.vala
+++ b/src/Widgets/WindowClone.vala
@@ -435,7 +435,7 @@ public class Gala.WindowClone : Clutter.Actor {
 
         active_shape.set_scale_factor (scale_factor);
 
-        if (clone == null || drag_action.dragging) {
+        if (clone == null || (drag_action != null && drag_action.dragging)) {
             return;
         }
 
@@ -460,7 +460,7 @@ public class Gala.WindowClone : Clutter.Actor {
     }
 
     public override bool enter_event (Clutter.CrossingEvent event) {
-        if (drag_action.dragging) {
+        if (drag_action != null && drag_action.dragging) {
             return Gdk.EVENT_PROPAGATE;
         }