diff --git a/app/layout/Chooser.zig b/app/layout/Chooser.zig
index 741fd1d89..ae6ee0fbb 100644
--- a/app/layout/Chooser.zig
+++ b/app/layout/Chooser.zig
@@ -303,7 +303,7 @@ fn carryLifted(self: *Chooser) void {
     } else {
         f.beginViewDrag(lift.id, lift.rect);
         // From the motion that lifted it on: a release in the same frame is the drag's too.
-        if (dvui.currentWindow().captures[0]) |cm| // ZIG017: per-pointer capture (dvui#1014); 0 is the mouse
+        if (dvui.captureMouseGet()) |cm|
             dvui.captureMouseCustom(cm, lift.event);
     }
     self.carried = lift.id;
diff --git a/plugins/workbench/src/Workspace.zig b/plugins/workbench/src/Workspace.zig
index 2976d590a..729ff3865 100644
--- a/plugins/workbench/src/Workspace.zig
+++ b/plugins/workbench/src/Workspace.zig
@@ -532,7 +532,7 @@ fn lift(id: []const u8, from: dvui.Rect.Physical, event_num: u16) void {
     wb.carried_tab_key = std.hash.Wyhash.hash(0, id);
     runtime.host().beginViewDrag(id, from);
     if (runtime.host().viewDragSurface() == null) return;
-    if (dvui.currentWindow().captures[0]) |cm| // ZIG017: per-pointer capture (dvui#1014); 0 is the mouse
+    if (dvui.captureMouseGet()) |cm|
         dvui.captureMouseCustom(cm, event_num);
 }