diff --git a/koha-tmpl/intranet-tmpl/prog/js/vue/components/Admin/RecordSources/RecordSourcesResource.vue b/koha-tmpl/intranet-tmpl/prog/js/vue/components/Admin/RecordSources/RecordSourcesResource.vue
index 53cbdef828..c06ed08ab6 100644
--- a/koha-tmpl/intranet-tmpl/prog/js/vue/components/Admin/RecordSources/RecordSourcesResource.vue
+++ b/koha-tmpl/intranet-tmpl/prog/js/vue/components/Admin/RecordSources/RecordSourcesResource.vue
@@ -40,6 +40,7 @@ export default {
                 newLabel: $__("New record source"),
             },
             props,
+            navigationOnFormSave: "RecordSourcesList",
             resourceAttrs: [
                 {
                     name: "record_source_id",
@@ -96,7 +97,7 @@ export default {
                             baseResource.setMessage(
                                 $__("Record source updated!")
                             );
-                            return recordResource
+                            return recordResource;
                         },
                         error => {}
                     );
@@ -104,7 +105,7 @@ export default {
                 return baseResource.apiClient.create(recordSource).then(
                     recordResource => {
                         baseResource.setMessage($__("Record source created!"));
-                        return recordResource
+                        return recordResource;
                     },
                     error => {}
                 );
diff --git a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ResourceFormSave.vue b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ResourceFormSave.vue
index c8eb6ab3de..e1fc2215c8 100644
--- a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ResourceFormSave.vue
+++ b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ResourceFormSave.vue
@@ -214,6 +214,7 @@ export default {
                     callback: () => {
                         saveOptionSelected.value = components.list;
                         if (
+                            props.instancedResource.stickyToolbar &&
                             props.instancedResource.stickyToolbar.includes(
                                 "Form"
                             )
@@ -229,6 +230,7 @@ export default {
                     callback: () => {
                         saveOptionSelected.value = components.show;
                         if (
+                            props.instancedResource.stickyToolbar &&
                             props.instancedResource.stickyToolbar.includes(
                                 "Form"
                             )
@@ -244,6 +246,7 @@ export default {
                     callback: () => {
                         saveOptionSelected.value = components.edit;
                         if (
+                            props.instancedResource.stickyToolbar &&
                             props.instancedResource.stickyToolbar.includes(
                                 "Form"
                             )
@@ -254,6 +257,7 @@ export default {
                 },
             };
             return Object.keys(buttonOptions).reduce((acc, key) => {
+                if (!components[key]) return acc;
                 if (key === "show" && !navigationOnFormSave) return acc;
                 if (components[key] === navigationOnFormSave) return acc;
                 return [buttonOptions[key], ...acc];