add reference to useShortcuts

app/src/modules/collections/routes/detail.vue

@@ -137,6 +137,7 @@
 		</template>
 
 		<v-form
+			ref="form"
 			:disabled="isNew ? false : updateAllowed === false"
 			:loading="loading"
 			:initial-values="item"
@@ -182,6 +183,7 @@
 
 <script lang="ts">
 import { defineComponent, computed, toRefs, ref } from '@vue/composition-api';
+import Vue from 'vue';
 
 import CollectionsNavigation from '../components/navigation.vue';
 import router from '@/router';
@@ -223,6 +225,7 @@ export default defineComponent({
 		},
 	},
 	setup(props) {
+		const form = ref<Vue | null>(null);
 		const userStore = useUserStore();
 
 		const { collection, primaryKey } = toRefs(props);
@@ -283,8 +286,8 @@ export default defineComponent({
 			return i18n.t('archive');
 		});
 
-		useShortcut('mod+s', saveAndStay);
-		useShortcut('mod+shift+s', saveAndAddNew);
+		useShortcut('mod+s', saveAndStay, form);
+		useShortcut('mod+shift+s', saveAndAddNew, form);
 
 		const navigationGuard: NavigationGuard = (to, from, next) => {
 			const hasEdits = Object.keys(edits.value).length > 0;
@@ -337,6 +340,7 @@ export default defineComponent({
 			updateAllowed,
 			toggleArchive,
 			validationErrors,
+			form,
 		};
 
 		function useBreadcrumb() {

app/src/modules/files/routes/detail.vue

@@ -132,6 +132,7 @@
 			/>
 
 			<v-form
+				ref="form"
 				:fields="formFields"
 				:loading="loading"
 				:initial-values="item"
@@ -231,6 +232,7 @@ export default defineComponent({
 		},
 	},
 	setup(props) {
+		const form = ref<HTMLElement | null>(null);
 		const { primaryKey } = toRefs(props);
 		const { breadcrumb } = useBreadcrumb();
 		const fieldsStore = useFieldsStore();
@@ -291,7 +293,7 @@ export default defineComponent({
 
 		const { moveToDialogActive, moveToFolder, moving, selectedFolder } = useMovetoFolder();
 
-		useShortcut('mod+s', saveAndStay);
+		useShortcut('mod+s', saveAndStay, form);
 
 		return {
 			item,
@@ -324,6 +326,7 @@ export default defineComponent({
 			moving,
 			selectedFolder,
 			fileSrc,
+			form,
 		};
 
 		function changeCacheBuster() {

app/src/modules/users/routes/detail.vue

@@ -119,6 +119,7 @@
 			</div>
 
 			<v-form
+				ref="form"
 				:fields="formFields"
 				:loading="loading"
 				:initial-values="item"
@@ -208,6 +209,7 @@ export default defineComponent({
 		},
 	},
 	setup(props) {
+		const form = ref<HTMLElement | null>(null);
 		const fieldsStore = useFieldsStore();
 		const userStore = useUserStore();
 
@@ -291,8 +293,8 @@ export default defineComponent({
 			return i18n.t('archive');
 		});
 
-		useShortcut('mod+s', saveAndStay);
-		useShortcut('mod+shift+s', saveAndAddNew);
+		useShortcut('mod+s', saveAndStay, form);
+		useShortcut('mod+shift+s', saveAndAddNew, form);
 
 		return {
 			title,
@@ -330,6 +332,7 @@ export default defineComponent({
 			collectionInfo,
 			archiving,
 			archiveTooltip,
+			form,
 		};
 
 		function useBreadcrumb() {