diff --git a/data/gala.metainfo.xml.in b/data/gala.metainfo.xml.in
index 03bf6bd2f..9ec779262 100644
--- a/data/gala.metainfo.xml.in
+++ b/data/gala.metainfo.xml.in
@@ -46,6 +46,7 @@
         <issue url="https://github.com/elementary/gala/issues/2131">Unthemed cursor style and glitchy menus on some applications</issue>
         <issue url="https://github.com/elementary/gala/issues/2159">Crash when moving windows between workspaces and using gestures to switch</issue>
         <issue url="https://github.com/elementary/gala/issues/2169">Text UI based Scaling: Tiny Titlebars in XWayland Apps</issue>
+        <issue url="https://github.com/elementary/gala/issues/2171">PiP dragging doesn't start until after mouse is released</issue>
       </issues>
     </release>
 
diff --git a/plugins/pip/PopupWindow.vala b/plugins/pip/PopupWindow.vala
index cf10a9c0d..c1c3b30fe 100644
--- a/plugins/pip/PopupWindow.vala
+++ b/plugins/pip/PopupWindow.vala
@@ -68,11 +68,6 @@ public class Gala.Plugins.PIP.PopupWindow : Clutter.Actor {
 
         clone = new Clutter.Clone (window_actor);
 
-        move_action = new DragDropAction (DragDropActionType.SOURCE, "pip");
-        move_action.drag_begin.connect (on_move_begin);
-        move_action.drag_canceled.connect (on_move_end);
-        move_action.actor_clicked.connect (activate);
-
         clone_container = new Clutter.Actor () {
             scale_x = 0.35f,
             scale_y = 0.35f
@@ -84,7 +79,12 @@ public class Gala.Plugins.PIP.PopupWindow : Clutter.Actor {
         };
         container.add_child (clone_container);
         container.add_effect (new ShadowEffect ("window"));
-        container.add_action (move_action);
+
+        move_action = new DragDropAction (DragDropActionType.SOURCE, "pip");
+        move_action.drag_begin.connect (on_move_begin);
+        move_action.drag_canceled.connect (on_move_end);
+        move_action.actor_clicked.connect (activate);
+        add_action (move_action);
 
         update_size ();