diff --git a/lib/Controller/ApiController.php b/lib/Controller/ApiController.php
index be6bc6470..7c636757e 100644
--- a/lib/Controller/ApiController.php
+++ b/lib/Controller/ApiController.php
@@ -180,6 +180,7 @@ public function newForm(?int $fromId = null): DataResponse {
 			unset($formData['id']);
 			unset($formData['created']);
 			unset($formData['lastUpdated']);
+			unset($formData['state']);
 			$formData['hash'] = $this->formsService->generateFormHash();
 			// TRANSLATORS Appendix to the form Title of a duplicated/copied form.
 			$formData['title'] .= ' - ' . $this->l10n->t('Copy');
diff --git a/src/Forms.vue b/src/Forms.vue
index e4719ec27..ef7b109ad 100644
--- a/src/Forms.vue
+++ b/src/Forms.vue
@@ -131,7 +131,10 @@
 		</template>
 
 		<!-- Archived forms modal -->
-		<ArchivedFormsModal :open.sync="showArchivedForms" :forms="archivedForms" />
+		<ArchivedFormsModal
+			:open.sync="showArchivedForms"
+			:forms="archivedForms"
+			@clone="onCloneForm" />
 	</NcContent>
 </template>
 
diff --git a/src/components/AppNavigationForm.vue b/src/components/AppNavigationForm.vue
index 1037b4002..de9b2da2d 100644
--- a/src/components/AppNavigationForm.vue
+++ b/src/components/AppNavigationForm.vue
@@ -57,7 +57,7 @@
 				{{ t('forms', 'Results') }}
 			</NcActionRouter>
 			<NcActionButton
-				v-if="canEdit && !isArchived"
+				v-if="canEdit"
 				:close-after-click="true"
 				@click="onCloneForm">
 				<template #icon>
@@ -278,6 +278,7 @@ export default {
 		onShareForm() {
 			this.$emit('open-sharing', this.form.hash)
 		},
+
 		onCloneForm() {
 			this.$emit('clone', this.form.id)
 		},
diff --git a/src/components/ArchivedFormsModal.vue b/src/components/ArchivedFormsModal.vue
index c5f5a20c6..126962537 100644
--- a/src/components/ArchivedFormsModal.vue
+++ b/src/components/ArchivedFormsModal.vue
@@ -17,6 +17,7 @@
 				:form="form"
 				:read-only="false"
 				force-display-actions
+				@clone="onCloneForm(form.id)"
 				@delete="onDelete(form)"
 				@mobile-close-navigation="$emit('update:open', false)" />
 		</ul>
@@ -69,6 +70,11 @@ export default defineComponent({
 	methods: {
 		t,
 
+		onCloneForm(formId) {
+			this.$emit('clone', formId)
+			this.$emit('update:open', false)
+		},
+
 		onDelete(form) {
 			this.shownForms = this.shownForms.filter(({ id }) => id !== form.id)
 		},