diff --git a/apps/frontend/src/pages/[type]/[id].vue b/apps/frontend/src/pages/[type]/[id].vue
index 8c252c65d2..a44ae0e9c1 100644
--- a/apps/frontend/src/pages/[type]/[id].vue
+++ b/apps/frontend/src/pages/[type]/[id].vue
@@ -1658,14 +1658,18 @@ const patchProjectMutation = useMutation({
 	},
 
 	onMutate: async ({ projectId, data }) => {
-		// Cancel outgoing refetches
-		await queryClient.cancelQueries({ queryKey: ['project', 'v2', projectId] })
+		// Cancel outgoing refetches for both slug-based and ID-based cache keys
+		// The query may be keyed by slug (routeProjectId) but we also have the actual UUID (projectId)
+		await queryClient.cancelQueries({ queryKey: ['project', 'v2', routeProjectId.value] })
+		if (routeProjectId.value !== projectId) {
+			await queryClient.cancelQueries({ queryKey: ['project', 'v2', projectId] })
+		}
 
-		// Snapshot previous value
-		const previousProject = queryClient.getQueryData(['project', 'v2', projectId])
+		// Snapshot previous value from the active query (uses route param as key)
+		const previousProject = queryClient.getQueryData(['project', 'v2', routeProjectId.value])
 
-		// Optimistic update
-		queryClient.setQueryData(['project', 'v2', projectId], (old) => {
+		// Optimistic update on the active query key
+		queryClient.setQueryData(['project', 'v2', routeProjectId.value], (old) => {
 			if (!old) return old
 			return { ...old, ...data }
 		})
@@ -1673,10 +1677,10 @@ const patchProjectMutation = useMutation({
 		return { previousProject }
 	},
 
-	onError: (err, { projectId }, context) => {
-		// Rollback on error
+	onError: (err, _variables, context) => {
+		// Rollback on error using the active query key
 		if (context?.previousProject) {
-			queryClient.setQueryData(['project', 'v2', projectId], context.previousProject)
+			queryClient.setQueryData(['project', 'v2', routeProjectId.value], context.previousProject)
 		}
 		addNotification({
 			title: formatMessage(commonMessages.errorNotificationTitle),
@@ -1687,8 +1691,11 @@ const patchProjectMutation = useMutation({
 	},
 
 	onSettled: async (_data, _error, { projectId }) => {
-		// Always refetch to ensure consistency
-		await queryClient.invalidateQueries({ queryKey: ['project', 'v2', projectId] })
+		// Invalidate both slug-based and ID-based cache keys to ensure consistency
+		await queryClient.invalidateQueries({ queryKey: ['project', 'v2', routeProjectId.value] })
+		if (routeProjectId.value !== projectId) {
+			await queryClient.invalidateQueries({ queryKey: ['project', 'v2', projectId] })
+		}
 		await queryClient.invalidateQueries({ queryKey: ['project', 'v3', projectId] })
 	},
 })
@@ -1703,11 +1710,17 @@ const patchStatusMutation = useMutation({
 	},
 
 	onMutate: async ({ projectId, status }) => {
-		await queryClient.cancelQueries({ queryKey: ['project', 'v2', projectId] })
-		const previousProject = queryClient.getQueryData(['project', 'v2', projectId])
+		// Cancel outgoing refetches for both slug-based and ID-based cache keys
+		await queryClient.cancelQueries({ queryKey: ['project', 'v2', routeProjectId.value] })
+		if (routeProjectId.value !== projectId) {
+			await queryClient.cancelQueries({ queryKey: ['project', 'v2', projectId] })
+		}
 
-		// Optimistic update
-		queryClient.setQueryData(['project', 'v2', projectId], (old) => {
+		// Snapshot previous value from the active query (uses route param as key)
+		const previousProject = queryClient.getQueryData(['project', 'v2', routeProjectId.value])
+
+		// Optimistic update on the active query key
+		queryClient.setQueryData(['project', 'v2', routeProjectId.value], (old) => {
 			if (!old) return old
 			return { ...old, status }
 		})
@@ -1715,9 +1728,10 @@ const patchStatusMutation = useMutation({
 		return { previousProject }
 	},
 
-	onError: (err, { projectId }, context) => {
+	onError: (err, _variables, context) => {
+		// Rollback on error using the active query key
 		if (context?.previousProject) {
-			queryClient.setQueryData(['project', 'v2', projectId], context.previousProject)
+			queryClient.setQueryData(['project', 'v2', routeProjectId.value], context.previousProject)
 		}
 		addNotification({
 			title: formatMessage(commonMessages.errorNotificationTitle),
@@ -1727,7 +1741,11 @@ const patchStatusMutation = useMutation({
 	},
 
 	onSettled: async (_data, _error, { projectId }) => {
-		await queryClient.invalidateQueries({ queryKey: ['project', 'v2', projectId] })
+		// Invalidate both slug-based and ID-based cache keys to ensure consistency
+		await queryClient.invalidateQueries({ queryKey: ['project', 'v2', routeProjectId.value] })
+		if (routeProjectId.value !== projectId) {
+			await queryClient.invalidateQueries({ queryKey: ['project', 'v2', projectId] })
+		}
 	},
 })
 
@@ -1902,6 +1920,9 @@ watch(downloadModal, (modal) => {
 })
 
 async function setProcessing() {
+	// Guard against multiple submissions while mutation is pending
+	if (patchStatusMutation.isPending.value) return
+
 	startLoading()
 	patchStatusMutation.mutate(
 		{ projectId: project.value.id, status: 'processing' },
diff --git a/apps/frontend/src/pages/[type]/[id]/settings/gallery.vue b/apps/frontend/src/pages/[type]/[id]/settings/gallery.vue
index b97b3b85b8..3b2acc9039 100644
--- a/apps/frontend/src/pages/[type]/[id]/settings/gallery.vue
+++ b/apps/frontend/src/pages/[type]/[id]/settings/gallery.vue
@@ -95,7 +95,7 @@
 					Unfeature image
 				</button>
 				<div class="button-group">
-					<button class="iconified-button" @click="$refs.modal_edit_item.hide()">
+					<button class="iconified-button" @click="modal_edit_item.hide()">
 						<XIcon aria-hidden="true" />
 						Cancel
 					</button>
@@ -250,7 +250,7 @@
 									editDescription = item.description
 									editFeatured = item.featured
 									editOrder = item.ordering
-									$refs.modal_edit_item.show()
+									modal_edit_item.show()
 								}
 							"
 						>
@@ -262,7 +262,7 @@
 							@click="
 								() => {
 									deleteIndex = index
-									$refs.modal_confirm.show()
+									modal_confirm.show()
 								}
 							"
 						>
@@ -306,7 +306,8 @@ import {
 
 import { isPermission } from '~/utils/permissions.ts'
 
-const { projectV2: project, currentMember } = injectProjectPageContext()
+const { addNotification } = injectNotificationManager()
+const { projectV2: project, currentMember, refreshProject } = injectProjectPageContext()
 
 const title = `${project.value.title} - Gallery`
 const description = `View ${project.value.gallery?.length ?? 0} images of ${project.value.title} on Modrinth.`
@@ -317,205 +318,199 @@ useSeoMeta({
 	ogTitle: title,
 	ogDescription: description,
 })
-</script>
 
-<script>
-export default defineNuxtComponent({
-	setup() {
-		const { addNotification } = injectNotificationManager()
-		const { projectV2: project, refreshProject } = injectProjectPageContext()
+const modal_edit_item = ref(null)
+const modal_confirm = ref(null)
+
+const expandedGalleryItem = ref(null)
+const expandedGalleryIndex = ref(0)
+const zoomedIn = ref(false)
+
+const deleteIndex = ref(-1)
+
+const editIndex = ref(-1)
+const editTitle = ref('')
+const editDescription = ref('')
+const editFeatured = ref(false)
+const editOrder = ref(null)
+const editFile = ref(null)
+const previewImage = ref(null)
+const shouldPreventActions = ref(false)
+
+const acceptFileTypes = 'image/png,image/jpeg,image/gif,image/webp,.png,.jpeg,.gif,.webp'
+
+const nextImage = () => {
+	expandedGalleryIndex.value++
+	if (expandedGalleryIndex.value >= project.value.gallery.length) {
+		expandedGalleryIndex.value = 0
+	}
+	expandedGalleryItem.value = project.value.gallery[expandedGalleryIndex.value]
+}
+
+const previousImage = () => {
+	expandedGalleryIndex.value--
+	if (expandedGalleryIndex.value < 0) {
+		expandedGalleryIndex.value = project.value.gallery.length - 1
+	}
+	expandedGalleryItem.value = project.value.gallery[expandedGalleryIndex.value]
+}
+
+const expandImage = (item, index) => {
+	expandedGalleryItem.value = item
+	expandedGalleryIndex.value = index
+	zoomedIn.value = false
+}
+
+const resetEdit = () => {
+	editIndex.value = -1
+	editTitle.value = ''
+	editDescription.value = ''
+	editFeatured.value = false
+	editOrder.value = null
+	editFile.value = null
+	previewImage.value = null
+}
 
-		return {
-			addNotification,
-			project,
-			refreshProject,
+const handleFiles = (files) => {
+	resetEdit()
+	editFile.value = files[0]
+
+	showPreviewImage()
+	modal_edit_item.value.show()
+}
+
+const showPreviewImage = () => {
+	const reader = new FileReader()
+	if (editFile.value instanceof Blob) {
+		reader.readAsDataURL(editFile.value)
+		reader.onload = (event) => {
+			previewImage.value = event.target.result
+		}
+	}
+}
+
+const createGalleryItem = async () => {
+	shouldPreventActions.value = true
+	startLoading()
+
+	try {
+		let url = `project/${project.value.id}/gallery?ext=${
+			editFile.value
+				? editFile.value.type.split('/')[editFile.value.type.split('/').length - 1]
+				: null
+		}&featured=${editFeatured.value}`
+
+		if (editTitle.value) {
+			url += `&title=${encodeURIComponent(editTitle.value)}`
 		}
-	},
-	data() {
-		return {
-			expandedGalleryItem: null,
-			expandedGalleryIndex: 0,
-			zoomedIn: false,
-
-			deleteIndex: -1,
-
-			editIndex: -1,
-			editTitle: '',
-			editDescription: '',
-			editFeatured: false,
-			editOrder: null,
-			editFile: null,
-			previewImage: null,
-			shouldPreventActions: false,
+		if (editDescription.value) {
+			url += `&description=${encodeURIComponent(editDescription.value)}`
 		}
-	},
-	computed: {
-		acceptFileTypes() {
-			return 'image/png,image/jpeg,image/gif,image/webp,.png,.jpeg,.gif,.webp'
-		},
-	},
-	mounted() {
-		this._keyListener = function (e) {
-			if (this.expandedGalleryItem) {
-				e.preventDefault()
-				if (e.key === 'Escape') {
-					this.expandedGalleryItem = null
-				} else if (e.key === 'ArrowLeft') {
-					e.stopPropagation()
-					this.previousImage()
-				} else if (e.key === 'ArrowRight') {
-					e.stopPropagation()
-					this.nextImage()
-				}
-			}
+		if (editOrder.value) {
+			url += `&ordering=${editOrder.value}`
 		}
 
-		document.addEventListener('keydown', this._keyListener.bind(this))
-	},
-	methods: {
-		nextImage() {
-			this.expandedGalleryIndex++
-			if (this.expandedGalleryIndex >= this.project.gallery.length) {
-				this.expandedGalleryIndex = 0
-			}
-			this.expandedGalleryItem = this.project.gallery[this.expandedGalleryIndex]
-		},
-		previousImage() {
-			this.expandedGalleryIndex--
-			if (this.expandedGalleryIndex < 0) {
-				this.expandedGalleryIndex = this.project.gallery.length - 1
-			}
-			this.expandedGalleryItem = this.project.gallery[this.expandedGalleryIndex]
-		},
-		expandImage(item, index) {
-			this.expandedGalleryItem = item
-			this.expandedGalleryIndex = index
-			this.zoomedIn = false
-		},
-		resetEdit() {
-			this.editIndex = -1
-			this.editTitle = ''
-			this.editDescription = ''
-			this.editFeatured = false
-			this.editOrder = null
-			this.editFile = null
-			this.previewImage = null
-		},
-		handleFiles(files) {
-			this.resetEdit()
-			this.editFile = files[0]
-
-			this.showPreviewImage()
-			this.$refs.modal_edit_item.show()
-		},
-		showPreviewImage() {
-			const reader = new FileReader()
-			if (this.editFile instanceof Blob) {
-				reader.readAsDataURL(this.editFile)
-				reader.onload = (event) => {
-					this.previewImage = event.target.result
-				}
-			}
-		},
-		async createGalleryItem() {
-			this.shouldPreventActions = true
-			startLoading()
-
-			try {
-				let url = `project/${this.project.id}/gallery?ext=${
-					this.editFile
-						? this.editFile.type.split('/')[this.editFile.type.split('/').length - 1]
-						: null
-				}&featured=${this.editFeatured}`
-
-				if (this.editTitle) {
-					url += `&title=${encodeURIComponent(this.editTitle)}`
-				}
-				if (this.editDescription) {
-					url += `&description=${encodeURIComponent(this.editDescription)}`
-				}
-				if (this.editOrder) {
-					url += `&ordering=${this.editOrder}`
-				}
+		await useBaseFetch(url, {
+			method: 'POST',
+			body: editFile.value,
+		})
+		await refreshProject()
+
+		modal_edit_item.value.hide()
+	} catch (err) {
+		addNotification({
+			title: 'An error occurred',
+			text: err.data ? err.data.description : err,
+			type: 'error',
+		})
+	}
 
-				await useBaseFetch(url, {
-					method: 'POST',
-					body: this.editFile,
-				})
-				await this.refreshProject()
-
-				this.$refs.modal_edit_item.hide()
-			} catch (err) {
-				this.addNotification({
-					title: 'An error occurred',
-					text: err.data ? err.data.description : err,
-					type: 'error',
-				})
-			}
+	stopLoading()
+	shouldPreventActions.value = false
+}
 
-			stopLoading()
-			this.shouldPreventActions = false
-		},
-		async editGalleryItem() {
-			this.shouldPreventActions = true
-			startLoading()
-			try {
-				let url = `project/${this.project.id}/gallery?url=${encodeURIComponent(
-					this.project.gallery[this.editIndex].url,
-				)}&featured=${this.editFeatured}`
-
-				if (this.editTitle) {
-					url += `&title=${encodeURIComponent(this.editTitle)}`
-				}
-				if (this.editDescription) {
-					url += `&description=${encodeURIComponent(this.editDescription)}`
-				}
-				if (this.editOrder) {
-					url += `&ordering=${this.editOrder}`
-				}
+const editGalleryItem = async () => {
+	shouldPreventActions.value = true
+	startLoading()
+	try {
+		let url = `project/${project.value.id}/gallery?url=${encodeURIComponent(
+			project.value.gallery[editIndex.value].url,
+		)}&featured=${editFeatured.value}`
 
-				await useBaseFetch(url, {
-					method: 'PATCH',
-				})
-
-				await this.refreshProject()
-				this.$refs.modal_edit_item.hide()
-			} catch (err) {
-				this.addNotification({
-					title: 'An error occurred',
-					text: err.data ? err.data.description : err,
-					type: 'error',
-				})
-			}
+		if (editTitle.value) {
+			url += `&title=${encodeURIComponent(editTitle.value)}`
+		}
+		if (editDescription.value) {
+			url += `&description=${encodeURIComponent(editDescription.value)}`
+		}
+		if (editOrder.value) {
+			url += `&ordering=${editOrder.value}`
+		}
 
-			stopLoading()
-			this.shouldPreventActions = false
-		},
-		async deleteGalleryImage() {
-			startLoading()
-
-			try {
-				await useBaseFetch(
-					`project/${this.project.id}/gallery?url=${encodeURIComponent(
-						this.project.gallery[this.deleteIndex].url,
-					)}`,
-					{
-						method: 'DELETE',
-					},
-				)
-
-				await this.refreshProject()
-			} catch (err) {
-				this.addNotification({
-					title: 'An error occurred',
-					text: err.data ? err.data.description : err,
-					type: 'error',
-				})
-			}
+		await useBaseFetch(url, {
+			method: 'PATCH',
+		})
+
+		await refreshProject()
+		modal_edit_item.value.hide()
+	} catch (err) {
+		addNotification({
+			title: 'An error occurred',
+			text: err.data ? err.data.description : err,
+			type: 'error',
+		})
+	}
+
+	stopLoading()
+	shouldPreventActions.value = false
+}
+
+const deleteGalleryImage = async () => {
+	startLoading()
+
+	try {
+		await useBaseFetch(
+			`project/${project.value.id}/gallery?url=${encodeURIComponent(
+				project.value.gallery[deleteIndex.value].url,
+			)}`,
+			{
+				method: 'DELETE',
+			},
+		)
+
+		await refreshProject()
+	} catch (err) {
+		addNotification({
+			title: 'An error occurred',
+			text: err.data ? err.data.description : err,
+			type: 'error',
+		})
+	}
+
+	stopLoading()
+}
+
+const handleKeydown = (e) => {
+	if (expandedGalleryItem.value) {
+		e.preventDefault()
+		if (e.key === 'Escape') {
+			expandedGalleryItem.value = null
+		} else if (e.key === 'ArrowLeft') {
+			e.stopPropagation()
+			previousImage()
+		} else if (e.key === 'ArrowRight') {
+			e.stopPropagation()
+			nextImage()
+		}
+	}
+}
+
+onMounted(() => {
+	document.addEventListener('keydown', handleKeydown)
+})
 
-			stopLoading()
-		},
-	},
+onUnmounted(() => {
+	document.removeEventListener('keydown', handleKeydown)
 })
 </script>