1 files changed, 12 insertions, 6 deletions
diff --git a/client/components/sidebar/sidebarArchives.js b/client/components/sidebar/sidebarArchives.js
index f2597c3c..18970267 100644
--- a/client/components/sidebar/sidebarArchives.js
+++ b/client/components/sidebar/sidebarArchives.js
@@ -11,11 +11,17 @@ BlazeComponent.extendComponent({
   },
 
   archivedCards() {
-    return Cards.find({ archived: true });
+    return Cards.find({
+      archived: true,
+      boardId: Session.get('currentBoard'),
+    });
   },
 
   archivedLists() {
-    return Lists.find({ archived: true });
+    return Lists.find({
+      archived: true,
+      boardId: Session.get('currentBoard'),
+    });
   },
 
   cardIsInArchivedList() {
@@ -29,8 +35,8 @@ BlazeComponent.extendComponent({
   events() {
     return [{
       'click .js-restore-card'() {
-        const cardId = this.currentData()._id;
-        Cards.update(cardId, {$set: {archived: false}});
+        const card = this.currentData();
+        card.restore();
       },
       'click .js-delete-card': Popup.afterConfirm('cardDelete', function() {
         const cardId = this._id;
@@ -38,8 +44,8 @@ BlazeComponent.extendComponent({
         Popup.close();
       }),
       'click .js-restore-list'() {
-        const listId = this.currentData()._id;
-        Lists.update(listId, {$set: {archived: false}});
+        const list = this.currentData();
+        list.restore();
       },
     }];
   },