diff --git a/client/src/components/Collections/PairedOrUnpairedComponents.ts b/client/src/components/Collections/PairedOrUnpairedComponents.ts
new file mode 100644
index 000000000000..88efbfae967a
--- /dev/null
+++ b/client/src/components/Collections/PairedOrUnpairedComponents.ts
@@ -0,0 +1,11 @@
+import CellDiscardComponent from "./common/CellDiscardComponent.vue";
+import CellStatusComponent from "./common/CellStatusComponent.vue";
+import PairedDatasetCellComponent from "./common/PairedDatasetCellComponent.vue";
+import CollectionCreator from "@/components/Collections/common/CollectionCreator.vue";
+
+export const components = {
+    CellDiscardComponent,
+    CellStatusComponent,
+    PairedDatasetCellComponent,
+    CollectionCreator,
+};
diff --git a/client/src/components/Collections/PairedOrUnpairedListCollectionCreator.vue b/client/src/components/Collections/PairedOrUnpairedListCollectionCreator.vue
index 25cd6b728e25..fd7350e44153 100644
--- a/client/src/components/Collections/PairedOrUnpairedListCollectionCreator.vue
+++ b/client/src/components/Collections/PairedOrUnpairedListCollectionCreator.vue
@@ -21,9 +21,6 @@ import { usePairingSummary } from "./common/usePairingSummary";
 import { type AutoPairingResult, autoPairWithCommonFilters } from "./pairing";
 
 import AutoPairing from "./common/AutoPairing.vue";
-import CellDiscardComponent from "./common/CellDiscardComponent.vue";
-import CellStatusComponent from "./common/CellStatusComponent.vue";
-import PairedDatasetCellComponent from "./common/PairedDatasetCellComponent.vue";
 import CollectionCreator from "@/components/Collections/common/CollectionCreator.vue";
 
 type CollectionElementIdentifier = components["schemas"]["CollectionElementIdentifier"];
@@ -520,18 +517,13 @@ const context = {
 </script>
 
 <script lang="ts">
+// eslint-disable-next-line import/first
+import { components as VueComponents } from "./PairedOrUnpairedComponents";
+
 // defineExpose should work for exposing PairedDatasetCellComponent to AG Grid
 // but doesn't seem to and it has been reported as an issue with Vue 2.7.
 export default {
-    components: {
-        CollectionCreator,
-        // eslint-disable-next-line vue/no-unused-components
-        PairedDatasetCellComponent,
-        // eslint-disable-next-line vue/no-unused-components
-        CellStatusComponent,
-        // eslint-disable-next-line vue/no-unused-components
-        CellDiscardComponent,
-    },
+    components: VueComponents,
 };
 </script>