diff --git a/src/components/board/Stack.vue b/src/components/board/Stack.vue
index 7cd674124..b0755edf9 100644
--- a/src/components/board/Stack.vue
+++ b/src/components/board/Stack.vue
@@ -53,12 +53,18 @@
 				</form>
 			</transition>
 			<NcActions v-if="canManage && !isArchived" :force-menu="true">
-				<NcActionButton @click="modalArchivAllCardsShow=true">
+				<NcActionButton v-if="!showArchived" icon="icon-archive" @click="modalArchivAllCardsShow=true">
 					<template #icon>
 						<ArchiveIcon decorative />
 					</template>
 					{{ t('deck', 'Archive all cards') }}
 				</NcActionButton>
+				<NcActionButton v-if="showArchived" @click="modalArchivAllCardsShow=true">
+					<template #icon>
+						<ArchiveIcon decorative />
+					</template>
+					{{ t('deck', 'Unarchive all cards') }}
+				</NcActionButton>
 				<NcActionButton icon="icon-delete" @click="deleteStack(stack)">
 					{{ t('deck', 'Delete list') }}
 				</NcActionButton>
@@ -72,11 +78,20 @@
 
 		<NcModal v-if="modalArchivAllCardsShow" @close="modalArchivAllCardsShow=false">
 			<div class="modal__content">
-				<h3>{{ t('deck', 'Archive all cards in this list') }}</h3>
+				<h3 v-if="!showArchived">
+					{{ t('deck', 'Archive all cards in this list') }}
+				</h3>
+				<h3 v-else>
+					{{ t('deck', 'Unarchive all cards in this list') }}
+				</h3>
+
 				<progress :value="stackTransfer.current" :max="stackTransfer.total" />
-				<button class="primary" @click="archiveAllCardsFromStack(stack)">
+				<button v-if="!showArchived" class="primary" @click="setArchivedToAllCardsFromStack(stack, !showArchived)">
 					{{ t('deck', 'Archive all cards') }}
 				</button>
+				<button v-else class="primary" @click="setArchivedToAllCardsFromStack(stack, !showArchived)">
+					{{ t('deck', 'Unarchive all cards') }}
+				</button>
 				<button @click="modalArchivAllCardsShow=false">
 					{{ t('deck', 'Cancel') }}
 				</button>
@@ -240,12 +255,12 @@ export default {
 			this.$store.dispatch('deleteStack', stack)
 			showUndo(t('deck', 'List deleted'), () => this.$store.dispatch('stackUndoDelete', stack))
 		},
-		archiveAllCardsFromStack(stack) {
+		setArchivedToAllCardsFromStack(stack, isArchived) {
 
 			this.stackTransfer.total = this.cardsByStack.length
 			this.cardsByStack.forEach((card, index) => {
 				this.stackTransfer.current = index
-				this.$store.dispatch('archiveUnarchiveCard', { ...card, archived: true })
+				this.$store.dispatch('archiveUnarchiveCard', { ...card, archived: isArchived })
 			})
 			this.modalArchivAllCardsShow = false
 		},