diff --git a/pkg/harvester/components/FilterVMSchedule.vue b/pkg/harvester/components/FilterVMSchedule.vue
index cb4eccb2445..0cf6002a67b 100644
--- a/pkg/harvester/components/FilterVMSchedule.vue
+++ b/pkg/harvester/components/FilterVMSchedule.vue
@@ -69,7 +69,7 @@ export default {
     </template>
 
     <v-popover
-      trigger="click"
+      :trigger="scheduleOptions.length ? 'click' : 'manual'"
       placement="bottom-end"
     >
       <slot name="header">
diff --git a/pkg/harvester/config/labels-annotations.js b/pkg/harvester/config/labels-annotations.js
index ba1864ffb03..64a27c5316e 100644
--- a/pkg/harvester/config/labels-annotations.js
+++ b/pkg/harvester/config/labels-annotations.js
@@ -53,4 +53,5 @@ export const HCI = {
   NODE_CPU_MANAGER_UPDATE_STATUS: 'harvesterhci.io/cpu-manager-update-status',
   CPU_MANAGER:                    'cpumanager',
   VM_DEVICE_ALLOCATION_DETAILS:   'harvesterhci.io/deviceAllocationDetails',
+  SVM_BACKUP_ID:                  'harvesterhci.io/svmbackupId',
 };
diff --git a/pkg/harvester/detail/harvesterhci.io.schedulevmbackup/BackupList.vue b/pkg/harvester/detail/harvesterhci.io.schedulevmbackup/BackupList.vue
index d8ff2abfc83..1ae77e55bf0 100644
--- a/pkg/harvester/detail/harvesterhci.io.schedulevmbackup/BackupList.vue
+++ b/pkg/harvester/detail/harvesterhci.io.schedulevmbackup/BackupList.vue
@@ -4,6 +4,7 @@ import { STATE, NAME, AGE } from '@shell/config/table-headers';
 import { allSettled } from '../../utils/promise';
 import { BACKUP_TYPE } from '../../config/types';
 import { HCI } from '../../types';
+import { HCI as HCI_ANNOTATIONS } from '@pkg/harvester/config/labels-annotations';
 
 export default {
   name: 'BackupList',
@@ -90,7 +91,7 @@ export default {
       let r = this.rows.filter(row => row.spec?.type === BACKUP_TYPE.BACKUP);
 
       if (this.id) {
-        r = r.filter(backup => backup.metadata.annotations?.['harvesterhci.io/svmbackupId'] === this.id);
+        r = r.filter(backup => backup.metadata.annotations?.[HCI_ANNOTATIONS.SVM_BACKUP_ID] === this.id);
       }
 
       return r;
diff --git a/pkg/harvester/detail/harvesterhci.io.schedulevmbackup/SnapshotList.vue b/pkg/harvester/detail/harvesterhci.io.schedulevmbackup/SnapshotList.vue
index 99d68f9aa38..9fa3111dcc0 100644
--- a/pkg/harvester/detail/harvesterhci.io.schedulevmbackup/SnapshotList.vue
+++ b/pkg/harvester/detail/harvesterhci.io.schedulevmbackup/SnapshotList.vue
@@ -3,6 +3,7 @@ import ResourceTable from '@shell/components/ResourceTable';
 import { STATE, NAME, AGE } from '@shell/config/table-headers';
 import { allSettled } from '../../utils/promise';
 import { BACKUP_TYPE } from '../../config/types';
+import { HCI as HCI_ANNOTATIONS } from '@pkg/harvester/config/labels-annotations';
 import { HCI } from '../../types';
 import { schema } from '../../list/harvesterhci.io.vmsnapshot';
 
@@ -58,7 +59,7 @@ export default {
       let r = this.rows.filter(row => row.spec?.type === BACKUP_TYPE.SNAPSHOT);
 
       if (this.id) {
-        r = r.filter(row => row.metadata.annotations?.['harvesterhci.io/svmbackupId'] === this.id);
+        r = r.filter(row => row.metadata.annotations?.[HCI_ANNOTATIONS.SVM_BACKUP_ID] === this.id);
       }
 
       return r;
diff --git a/pkg/harvester/dialog/HarvesterScheduleModal.vue b/pkg/harvester/dialog/HarvesterScheduleModal.vue
deleted file mode 100644
index a623ab742b7..00000000000
--- a/pkg/harvester/dialog/HarvesterScheduleModal.vue
+++ /dev/null
@@ -1,129 +0,0 @@
-<script>
-import { exceptionToErrorsArray } from '@shell/utils/error';
-import { mapGetters } from 'vuex';
-import { Card } from '@components/Card';
-import { Banner } from '@components/Banner';
-import AsyncButton from '@shell/components/AsyncButton';
-import { LabeledInput } from '@components/Form/LabeledInput';
-
-export default {
-  name: 'HarvesterScheduleModal',
-
-  components: {
-    AsyncButton,
-    Card,
-    LabeledInput,
-    Banner
-  },
-
-  props: {
-    resources: {
-      type:     Array,
-      required: true
-    }
-  },
-
-  data() {
-    return {
-      retain:         2,
-      autoResume:     false,
-      cronExpression: '',
-      maxFlunk:       2,
-      targetVM:       '',
-      errors:         []
-    };
-  },
-
-  computed: {
-    ...mapGetters({ t: 'i18n/t' }),
-
-    actionResource() {
-      return this.resources[0];
-    }
-  },
-
-  methods: {
-    close() {
-      this.targetVM = '';
-      this.$emit('close');
-    },
-
-    async save(buttonCb) {
-      if (this.actionResource) {
-        try {
-          const res = await this.actionResource.doAction(
-            'backup',
-            { name: this.backUpName },
-            {},
-            false
-          );
-
-          if (res._status === 200 || res._status === 204) {
-            this.$store.dispatch(
-              'growl/success',
-              {
-                title:   this.t('generic.notification.title.succeed'),
-                message: this.t('harvester.modal.backup.success', { backUpName: this.backUpName })
-              },
-              { root: true }
-            );
-
-            this.close();
-
-            buttonCb(true);
-          } else {
-            const error = [res?.data] || exceptionToErrorsArray(res);
-
-            this.$set(this, 'errors', error);
-            buttonCb(false);
-          }
-        } catch (err) {
-          const error = err?.data || err;
-          const message = exceptionToErrorsArray(error);
-
-          this.$set(this, 'errors', message);
-          buttonCb(false);
-        }
-      }
-    }
-  }
-};
-</script>
-
-<template>
-  <Card :show-highlight-border="true">
-    <h4
-      slot="title"
-      v-clean-html="t('harvester.modal.schedule.title')"
-      class="text-default-text"
-    />
-
-    <template #body>
-      <LabeledInput v-model="targetVM" :label="t('generic.name')" required />
-    </template>
-
-    <div slot="actions" class="actions">
-      <div class="buttons">
-        <button class="btn role-secondary mr-10" @click="close">
-          {{ t('generic.cancel') }}
-        </button>
-
-        <AsyncButton mode="create" :disabled="!backUpName" @click="save" />
-      </div>
-
-      <Banner v-for="(err, i) in errors" :key="i" color="error" :label="err" />
-    </div>
-  </Card>
-</template>
-
-<style lang="scss" scoped>
-.actions {
-  width: 100%;
-}
-
-.buttons {
-  display: flex;
-  justify-content: flex-end;
-  width: 100%;
-}
-</style>
diff --git a/pkg/harvester/edit/harvesterhci.io.virtualmachinebackup.vue b/pkg/harvester/edit/harvesterhci.io.virtualmachinebackup.vue
index 05b4c1b3139..b42c29e4a81 100644
--- a/pkg/harvester/edit/harvesterhci.io.virtualmachinebackup.vue
+++ b/pkg/harvester/edit/harvesterhci.io.virtualmachinebackup.vue
@@ -159,6 +159,10 @@ export default {
   },
 
   methods: {
+    cancelAction() {
+      this.$router.go(-1);
+    },
+
     async saveRestore(buttonCb) {
       this.update();
 
@@ -261,7 +265,7 @@ export default {
       />
     </div>
 
-    <Footer mode="create" class="footer" :errors="errors" @save="saveRestore" @done="done" />
+    <Footer mode="create" class="footer" :errors="errors" @save="saveRestore" @done="cancelAction" />
   </div>
 </template>
 
diff --git a/pkg/harvester/edit/harvesterhci.io.vmsnapshot.vue b/pkg/harvester/edit/harvesterhci.io.vmsnapshot.vue
index 60f40ce50a9..207ebd00209 100644
--- a/pkg/harvester/edit/harvesterhci.io.vmsnapshot.vue
+++ b/pkg/harvester/edit/harvesterhci.io.vmsnapshot.vue
@@ -157,6 +157,9 @@ export default {
   },
 
   methods: {
+    cancelAction() {
+      this.$router.go(-1);
+    },
     async saveRestore(buttonCb) {
       this.update();
 
@@ -241,7 +244,7 @@ export default {
       <LabeledSelect v-if="!restoreNewVm" v-model="deletionPolicy" :label="t('harvester.backup.restore.deletePreviousVolumes')" :options="deletionPolicyOption" />
     </div>
 
-    <Footer mode="create" class="footer" :errors="errors" @save="saveRestore" @done="done" />
+    <Footer mode="create" class="footer" :errors="errors" @save="saveRestore" @done="cancelAction" />
   </div>
 </template>
 
diff --git a/pkg/harvester/models/harvesterhci.io.virtualmachinebackup.js b/pkg/harvester/models/harvesterhci.io.virtualmachinebackup.js
index fa9a2220c28..11783731f14 100644
--- a/pkg/harvester/models/harvesterhci.io.virtualmachinebackup.js
+++ b/pkg/harvester/models/harvesterhci.io.virtualmachinebackup.js
@@ -2,6 +2,7 @@ import { HCI } from '../types';
 import { get, clone } from '@shell/utils/object';
 import { findBy } from '@shell/utils/array';
 import { colorForState } from '@shell/plugins/dashboard-store/resource-class';
+import { HCI as HCI_ANNOTATIONS } from '@pkg/harvester/config/labels-annotations';
 import { _CREATE } from '@shell/config/query-params';
 import HarvesterResource from './harvester';
 import { PRODUCT_NAME as HARVESTER_PRODUCT } from '../config/harvester';
@@ -81,22 +82,29 @@ export default class HciVmBackup extends HarvesterResource {
 
   restoreExistingVM(resource = this) {
     const router = this.currentRouter();
+    const targetResource = resource.spec.type === BACKUP_TYPE.BACKUP ? HCI.BACKUP : HCI.VM_SNAPSHOT;
 
     router.push({
       name:   `${ HARVESTER_PRODUCT }-c-cluster-resource-create`,
-      params: { resource: HCI.BACKUP },
-      query:  { restoreMode: 'existing', resourceName: resource.name }
+      params: { resource: targetResource },
+      query:  {
+        restoreMode:  'existing',
+        resourceName: resource.name,
+      }
     });
   }
 
   restoreNewVM(resource = this) {
-    // const route = this.currentRoute();
     const router = this.currentRouter();
+    const targetResource = resource.spec.type === BACKUP_TYPE.BACKUP ? HCI.BACKUP : HCI.VM_SNAPSHOT;
 
     router.push({
       name:   `${ HARVESTER_PRODUCT }-c-cluster-resource-create`,
-      params: { resource: HCI.BACKUP },
-      query:  { restoreMode: 'new', resourceName: resource.name }
+      params: { resource: targetResource },
+      query:  {
+        restoreMode:  'new',
+        resourceName: resource.name,
+      }
     });
   }
 
@@ -123,8 +131,23 @@ export default class HciVmBackup extends HarvesterResource {
     return colorForState(state);
   }
 
+  getTargetResource(hash, route) {
+    if (hash === '') {
+      return route.params.resource;
+    }
+
+    switch (hash) {
+    case `#backups`:
+      return HCI.BACKUP;
+    case `#snapshots`:
+      return HCI.VM_SNAPSHOT;
+    default:
+      return route.params.resource;
+    }
+  }
+
   get sourceSchedule() {
-    return this.metadata?.annotations['harvesterhci.io/svmbackupId'];
+    return this.metadata?.annotations[HCI_ANNOTATIONS.SVM_BACKUP_ID];
   }
 
   get attachVM() {