diff --git a/contentcuration/contentcuration/frontend/administration/pages/Channels/ChannelActionsDropdown.vue b/contentcuration/contentcuration/frontend/administration/pages/Channels/ChannelActionsDropdown.vue
index 62f992d766..dcbc3824c9 100644
--- a/contentcuration/contentcuration/frontend/administration/pages/Channels/ChannelActionsDropdown.vue
+++ b/contentcuration/contentcuration/frontend/administration/pages/Channels/ChannelActionsDropdown.vue
@@ -1,54 +1,25 @@
 <template>
 
   <div>
-    <ConfirmationDialog
-      v-model="restoreDialog"
-      title="Restore channel"
-      :text="`Are you sure you want to restore ${name} and make it active again?`"
-      data-test="confirm-restore"
-      confirmButtonText="Restore"
-      @confirm="restoreHandler"
-    />
+    <KModal
+      v-if="activeDialog"
+      :title="dialogConfig.title"
+      :submitText="dialogConfig.submitText"
+      cancelText="Cancel"
+      :data-test="dialogConfig.testId"
+      @submit="handleSubmit"
+      @cancel="activeDialog = null"
+    >
+      <p>{{ dialogConfig.message }}</p>
+    </KModal>
 
-    <ConfirmationDialog
-      v-model="makePublicDialog"
-      title="Make channel public"
-      :text="`All users will be able to view and import content from ${name}.`"
-      data-test="confirm-public"
-      confirmButtonText="Make public"
-      @confirm="makePublicHandler"
-    />
-    <ConfirmationDialog
-      v-model="makePrivateDialog"
-      title="Make channel private"
-      :text="`Only users with view-only or edit permissions will be able to access ${name}.`"
-      data-test="confirm-private"
-      confirmButtonText="Make private"
-      @confirm="makePrivateHandler"
-    />
-    <ConfirmationDialog
-      v-model="deleteDialog"
-      title="Permanently delete channel"
-      :text="`Are you sure you want to permanently delete ${name}?  This can not be undone.`"
-      data-test="confirm-delete"
-      confirmButtonText="Delete permanently"
-      @confirm="deleteHandler"
-    />
-    <ConfirmationDialog
-      v-model="softDeleteDialog"
-      title="Permanently delete channel"
-      :text="`Are you sure you want to delete ${name}?`"
-      data-test="confirm-softdelete"
-      confirmButtonText="Delete"
-      @confirm="softDeleteHandler"
-    />
     <BaseMenu>
       <template #activator="{ on }">
         <VBtn
           v-bind="$attrs"
           v-on="on"
         >
-          actions
+          Actions
           <Icon
             icon="dropdown"
             class="ml-1"
@@ -59,13 +30,13 @@
         <template v-if="channel.deleted">
           <VListTile
             data-test="restore"
-            @click="restoreDialog = true"
+            @click="openDialog('restore')"
           >
             <VListTileTitle>Restore</VListTileTitle>
           </VListTile>
           <VListTile
             data-test="delete"
-            @click="deleteDialog = true"
+            @click="openDialog('permanentDelete')"
           >
             <VListTileTitle>Delete permanently</VListTileTitle>
           </VListTile>
@@ -92,21 +63,21 @@
           <VListTile
             v-if="channel.public"
             data-test="private"
-            @click="makePrivateDialog = true"
+            @click="openDialog('makePrivate')"
           >
             <VListTileTitle>Make private</VListTileTitle>
           </VListTile>
           <VListTile
             v-else
             data-test="public"
-            @click="makePublicDialog = true"
+            @click="openDialog('makePublic')"
           >
             <VListTileTitle>Make public</VListTileTitle>
           </VListTile>
           <VListTile
             v-if="!channel.public"
             data-test="softdelete"
-            @click="softDeleteDialog = true"
+            @click="openDialog('softDelete')"
           >
             <VListTileTitle>Delete channel</VListTileTitle>
           </VListTile>
@@ -121,15 +92,11 @@
 <script>
 
   import { mapActions, mapGetters } from 'vuex';
-  import ConfirmationDialog from '../../components/ConfirmationDialog';
   import { RouteNames } from '../../constants';
   import { channelExportMixin } from 'shared/views/channel/mixins';
 
   export default {
     name: 'ChannelActionsDropdown',
-    components: {
-      ConfirmationDialog,
-    },
     mixins: [channelExportMixin],
     props: {
       channelId: {
@@ -138,11 +105,7 @@
       },
     },
     data: () => ({
-      deleteDialog: false,
-      makePublicDialog: false,
-      makePrivateDialog: false,
-      restoreDialog: false,
-      softDeleteDialog: false,
+      activeDialog: null,
     }),
     computed: {
       ...mapGetters('channel', ['getChannel']),
@@ -160,6 +123,46 @@
           },
         };
       },
+      dialogConfig() {
+        const configs = {
+          restore: {
+            title: 'Restore channel',
+            submitText: 'Restore',
+            message: `Are you sure you want to restore ${this.name} and make it active again?`,
+            testId: 'confirm-restore',
+            handler: this.restoreHandler,
+          },
+          makePublic: {
+            title: 'Make channel public',
+            submitText: 'Make public',
+            message: `All users will be able to view and import content from ${this.name}.`,
+            testId: 'confirm-public',
+            handler: this.makePublicHandler,
+          },
+          makePrivate: {
+            title: 'Make channel private',
+            submitText: 'Make private',
+            message: `Only users with view-only or edit permissions will be able to access ${this.name}.`,
+            testId: 'confirm-private',
+            handler: this.makePrivateHandler,
+          },
+          permanentDelete: {
+            title: 'Permanently delete channel',
+            submitText: 'Delete permanently',
+            message: `Are you sure you want to permanently delete ${this.name}? This can not be undone.`,
+            testId: 'confirm-delete',
+            handler: this.deleteHandler,
+          },
+          softDelete: {
+            title: 'Delete channel',
+            submitText: 'Delete',
+            message: `Are you sure you want to delete ${this.name}?`,
+            testId: 'confirm-softdelete',
+            handler: this.softDeleteHandler,
+          },
+        };
+        return configs[this.activeDialog] || {};
+      },
     },
     methods: {
       ...mapActions('channelAdmin', [
@@ -167,6 +170,15 @@
         'deleteChannel',
         'updateChannel',
       ]),
+      openDialog(type) {
+        this.activeDialog = type;
+      },
+      handleSubmit() {
+        if (this.dialogConfig.handler) {
+          this.dialogConfig.handler();
+        }
+        this.activeDialog = null;
+      },
       async downloadPDF() {
         this.$store.dispatch('showSnackbarSimple', 'Generating PDF...');
         const channelList = await this.getAdminChannelListDetails([this.channel.id]);
@@ -178,7 +190,6 @@
         return this.generateChannelsCSV(channelList);
       },
       restoreHandler() {
-        this.restoreDialog = false;
         this.updateChannel({
           id: this.channelId,
           deleted: false,
@@ -187,7 +198,6 @@
         });
       },
       softDeleteHandler() {
-        this.softDeleteDialog = false;
         this.updateChannel({
           id: this.channelId,
           deleted: true,
@@ -196,14 +206,12 @@
         });
       },
       deleteHandler() {
-        this.deleteDialog = false;
         this.$emit('deleted');
         return this.deleteChannel(this.channelId).then(() => {
           this.$store.dispatch('showSnackbarSimple', 'Channel deleted permanently');
         });
       },
       makePublicHandler() {
-        this.makePublicDialog = false;
         this.updateChannel({
           id: this.channelId,
           isPublic: true,
@@ -212,7 +220,6 @@
         });
       },
       makePrivateHandler() {
-        this.makePrivateDialog = false;
         this.updateChannel({
           id: this.channelId,
           isPublic: false,
diff --git a/contentcuration/contentcuration/frontend/administration/pages/Channels/__tests__/channelActionsDropdown.spec.js b/contentcuration/contentcuration/frontend/administration/pages/Channels/__tests__/channelActionsDropdown.spec.js
index 01113d2371..a778f403ad 100644
--- a/contentcuration/contentcuration/frontend/administration/pages/Channels/__tests__/channelActionsDropdown.spec.js
+++ b/contentcuration/contentcuration/frontend/administration/pages/Channels/__tests__/channelActionsDropdown.spec.js
@@ -30,11 +30,20 @@ function makeWrapper(channelProps = {}) {
   };
   mocks.downloadPDF = jest.spyOn(ChannelActionsDropdown.methods, 'downloadPDF').mockResolvedValue();
   mocks.downloadCSV = jest.spyOn(ChannelActionsDropdown.methods, 'downloadCSV').mockResolvedValue();
-  mocks.deleteChannel = jest
-    .spyOn(ChannelActionsDropdown.methods, 'deleteChannel')
+  mocks.restoreHandler = jest
+    .spyOn(ChannelActionsDropdown.methods, 'restoreHandler')
     .mockResolvedValue();
-  mocks.updateChannel = jest
-    .spyOn(ChannelActionsDropdown.methods, 'updateChannel')
+  mocks.softDeleteHandler = jest
+    .spyOn(ChannelActionsDropdown.methods, 'softDeleteHandler')
+    .mockResolvedValue();
+  mocks.makePublicHandler = jest
+    .spyOn(ChannelActionsDropdown.methods, 'makePublicHandler')
+    .mockResolvedValue();
+  mocks.makePrivateHandler = jest
+    .spyOn(ChannelActionsDropdown.methods, 'makePrivateHandler')
+    .mockResolvedValue();
+  mocks.deleteHandler = jest
+    .spyOn(ChannelActionsDropdown.methods, 'deleteHandler')
     .mockResolvedValue();
 
   const wrapper = mount(ChannelActionsDropdown, {
@@ -69,23 +78,25 @@ describe('channelActionsDropdown', () => {
     });
 
     it('restore channel should open restore confirmation', async () => {
-      await wrapper.findComponent('[data-test="restore"]').trigger('click');
-      expect(wrapper.vm.restoreDialog).toBe(true);
+      await wrapper.find('[data-test="restore"]').trigger('click');
+      expect(wrapper.vm.activeDialog).toBe('restore');
     });
 
-    it('confirm restore channel should call updateChannel with deleted = false', () => {
-      wrapper.findComponent('[data-test="confirm-restore"]').vm.$emit('confirm');
-      expect(mocks.updateChannel).toHaveBeenCalledWith({ id: channelId, deleted: false });
+    it('confirm restore channel should call restoreHandler', async () => {
+      await wrapper.find('[data-test="restore"]').trigger('click');
+      wrapper.find('[data-test="confirm-restore"]').vm.$emit('submit');
+      expect(mocks.restoreHandler).toHaveBeenCalled();
     });
 
     it('delete channel should open delete confirmation', async () => {
-      await wrapper.findComponent('[data-test="delete"]').trigger('click');
-      expect(wrapper.vm.deleteDialog).toBe(true);
+      await wrapper.find('[data-test="delete"]').trigger('click');
+      expect(wrapper.vm.activeDialog).toBe('permanentDelete');
     });
 
-    it('confirm delete channel should call deleteChannel', () => {
-      wrapper.findComponent('[data-test="confirm-delete"]').vm.$emit('confirm');
-      expect(mocks.deleteChannel).toHaveBeenCalledWith(channelId);
+    it('confirm delete channel should call deleteHandler', async () => {
+      await wrapper.find('[data-test="delete"]').trigger('click');
+      wrapper.find('[data-test="confirm-delete"]').vm.$emit('submit');
+      expect(mocks.deleteHandler).toHaveBeenCalled();
     });
   });
 
@@ -95,49 +106,91 @@ describe('channelActionsDropdown', () => {
     });
 
     it('download PDF button should call downloadPDF', async () => {
-      await wrapper.findComponent('[data-test="pdf"]').trigger('click');
+      await wrapper.find('[data-test="pdf"]').trigger('click');
       expect(mocks.downloadPDF).toHaveBeenCalled();
     });
 
     it('download CSV button should call downloadCSV', async () => {
-      await wrapper.findComponent('[data-test="csv"]').trigger('click');
+      await wrapper.find('[data-test="csv"]').trigger('click');
       expect(mocks.downloadCSV).toHaveBeenCalled();
     });
 
     it('make public button should open make public confirmation', async () => {
-      await wrapper.findComponent('[data-test="public"]').trigger('click');
-      expect(wrapper.vm.makePublicDialog).toBe(true);
+      await wrapper.find('[data-test="public"]').trigger('click');
+      expect(wrapper.vm.activeDialog).toBe('makePublic');
     });
 
-    it('confirm make public should call updateChannel with isPublic = true', () => {
-      wrapper.findComponent('[data-test="confirm-public"]').vm.$emit('confirm');
-      expect(mocks.updateChannel).toHaveBeenCalledWith({ id: channelId, isPublic: true });
+    it('confirm make public should call makePublicHandler', async () => {
+      await wrapper.find('[data-test="public"]').trigger('click');
+      wrapper.find('[data-test="confirm-public"]').vm.$emit('submit');
+      expect(mocks.makePublicHandler).toHaveBeenCalled();
     });
 
     it('soft delete button should open soft delete confirmation', async () => {
-      await wrapper.findComponent('[data-test="softdelete"]').trigger('click');
-      expect(wrapper.vm.softDeleteDialog).toBe(true);
+      await wrapper.find('[data-test="softdelete"]').trigger('click');
+      expect(wrapper.vm.activeDialog).toBe('softDelete');
     });
 
-    it('confirm soft delete button should call updateChannel with deleted = true', () => {
-      wrapper.findComponent('[data-test="confirm-softdelete"]').vm.$emit('confirm');
-      expect(mocks.updateChannel).toHaveBeenCalledWith({ id: channelId, deleted: true });
+    it('confirm soft delete button should call softDeleteHandler', async () => {
+      await wrapper.find('[data-test="softdelete"]').trigger('click');
+      wrapper.find('[data-test="confirm-softdelete"]').vm.$emit('submit');
+      expect(mocks.softDeleteHandler).toHaveBeenCalled();
     });
   });
 
   describe('public channel actions', () => {
     beforeEach(() => {
-      [wrapper, mocks] = makeWrapper();
+      [wrapper, mocks] = makeWrapper({ public: true, deleted: false });
     });
 
     it('make private button should open make private confirmation', async () => {
-      await wrapper.findComponent('[data-test="private"]').trigger('click');
-      expect(wrapper.vm.makePrivateDialog).toBe(true);
+      await wrapper.find('[data-test="private"]').trigger('click');
+      expect(wrapper.vm.activeDialog).toBe('makePrivate');
+    });
+
+    it('confirm make private should call makePrivateHandler', async () => {
+      await wrapper.find('[data-test="private"]').trigger('click');
+      wrapper.find('[data-test="confirm-private"]').vm.$emit('submit');
+      expect(mocks.makePrivateHandler).toHaveBeenCalled();
+    });
+
+    it('should not show soft delete button for public channels', () => {
+      expect(wrapper.find('[data-test="softdelete"]').exists()).toBe(false);
+    });
+  });
+
+  describe('modal configuration', () => {
+    beforeEach(() => {
+      [wrapper, mocks] = makeWrapper({ public: false, deleted: false });
+    });
+
+    it('should set correct dialog config for makePublic', async () => {
+      await wrapper.find('[data-test="public"]').trigger('click');
+      expect(wrapper.vm.dialogConfig.title).toBe('Make channel public');
+      expect(wrapper.vm.dialogConfig.submitText).toBe('Make public');
+      expect(wrapper.vm.dialogConfig.testId).toBe('confirm-public');
+    });
+
+    it('should set correct dialog config for makePrivate', async () => {
+      [wrapper, mocks] = makeWrapper({ public: true, deleted: false });
+      await wrapper.find('[data-test="private"]').trigger('click');
+      expect(wrapper.vm.dialogConfig.title).toBe('Make channel private');
+      expect(wrapper.vm.dialogConfig.submitText).toBe('Make private');
+      expect(wrapper.vm.dialogConfig.testId).toBe('confirm-private');
+    });
+
+    it('should close dialog when cancel is emitted', async () => {
+      await wrapper.find('[data-test="public"]').trigger('click');
+      expect(wrapper.vm.activeDialog).toBe('makePublic');
+      wrapper.find('[data-test="confirm-public"]').vm.$emit('cancel');
+      expect(wrapper.vm.activeDialog).toBeNull();
     });
 
-    it('confirm make private should call updateChannel with isPublic = false', () => {
-      wrapper.findComponent('[data-test="confirm-private"]').vm.$emit('confirm');
-      expect(mocks.updateChannel).toHaveBeenCalledWith({ id: channelId, isPublic: false });
+    it('should call handleSubmit when submit is emitted', async () => {
+      const handleSubmitSpy = jest.spyOn(wrapper.vm, 'handleSubmit');
+      await wrapper.find('[data-test="public"]').trigger('click');
+      wrapper.find('[data-test="confirm-public"]').vm.$emit('submit');
+      expect(handleSubmitSpy).toHaveBeenCalled();
     });
   });
 });