diff --git a/CHANGES.rst b/CHANGES.rst
index c388c4f9c1..6196f6a6dd 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -12,6 +12,8 @@ Cubeviz
Imviz
^^^^^
+- Aperture photometry (previously "Imviz Simple Aperture Photometry") now supports batch mode. [#2465]
+
Mosviz
^^^^^^
diff --git a/docs/imviz/plugins.rst b/docs/imviz/plugins.rst
index c2da960ffa..c4fd9ed45b 100644
--- a/docs/imviz/plugins.rst
+++ b/docs/imviz/plugins.rst
@@ -161,8 +161,8 @@ This plugin only considers pixel locations, not sky coordinates.
.. _aper-phot-simple:
-Simple Aperture Photometry
-==========================
+Aperture Photometry
+===================
.. warning::
diff --git a/jdaviz/components/plugin_dataset_select.vue b/jdaviz/components/plugin_dataset_select.vue
index 2b2e2f5ce7..e13d4fe3aa 100644
--- a/jdaviz/components/plugin_dataset_select.vue
+++ b/jdaviz/components/plugin_dataset_select.vue
@@ -10,39 +10,68 @@
:label="label ? label : 'Data'"
:hint="hint ? hint : 'Select data.'"
:rules="rules ? rules : []"
+ :multiple="multiselect"
+ :chips="multiselect"
item-text="label"
item-value="label"
persistent-hint
>
-
-
-
-
- {{ data.item.label }}
-
-
-
-
-
-
-
- {{ data.item.label }}
-
-
-
+
+
+
+
+
+ {{ data.item.label }}
+
+
+
+
+ {{ data.item.label }}
+
+
+
+
+ {if (selected.length < items.length) { $emit('update:selected', items.map((item) => item.label))} else {$emit('update:selected', [])}}"
+ >
+
+
+ {{ selected.length == items.length ? 'mdi-close-box' : selected.length ? 'mdi-minus-box' : 'mdi-checkbox-blank-outline' }}
+
+
+
+
+ {{ selected.length < items.length ? "Select All" : "Clear All" }}
+
+
+
+
+
+
+
+
+
+ {{ data.item.label }}
+
+
+
-