diff --git a/client/components/lists/listHeader.jade b/client/components/lists/listHeader.jade
index 72cd0fe97..750cf3a21 100644
--- a/client/components/lists/listHeader.jade
+++ b/client/components/lists/listHeader.jade
@@ -21,16 +21,11 @@ template(name="listActionPopup")
     li: a.js-add-card {{_ 'add-card'}}
     if cards.count
       li: a.js-select-cards {{_ 'list-select-cards'}}
-      li: a.js-move-cards {{_ 'list-move-cards'}}
-      li: a.js-archive-cards {{_ 'list-archive-cards'}}
   hr
   ul.pop-over-list
     li: a.js-import-card {{_ 'import-card'}}
     li: a.js-close-list {{_ 'archive-list'}}
 
-template(name="listMoveCardsPopup")
-  +boardLists
-
 template(name="boardLists")
   ul.pop-over-list
     each currentBoard.lists
@@ -39,7 +34,3 @@ template(name="boardLists")
           a.disabled {{title}} ({{_ 'current'}})
         else
           a.js-select-list= title
-
-template(name="listArchiveCardsPopup")
-  p {{_ 'list-archive-cards-pop'}}
-  input.js-confirm.negate.full(type="submit" value="{{_ 'archive-all'}}")
diff --git a/client/components/lists/listHeader.js b/client/components/lists/listHeader.js
index d660508a7..5b7c57139 100644
--- a/client/components/lists/listHeader.js
+++ b/client/components/lists/listHeader.js
@@ -34,28 +34,9 @@ Template.listActionPopup.events({
     Popup.close();
   },
   'click .js-import-card': Popup.open('listImportCard'),
-  'click .js-move-cards': Popup.open('listMoveCards'),
-  'click .js-archive-cards': Popup.afterConfirm('listArchiveCards', function() {
-    this.allCards().forEach((card) => {
-      card.archive();
-    });
-    Popup.close();
-  }),
-
   'click .js-close-list'(evt) {
     evt.preventDefault();
     this.archive();
     Popup.close();
   },
 });
-
-Template.listMoveCardsPopup.events({
-  'click .js-select-list'() {
-    const fromList = Template.parentData(2).data;
-    const toList = this._id;
-    fromList.allCards().forEach((card) => {
-      card.move(toList);
-    });
-    Popup.close();
-  },
-});
diff --git a/client/components/sidebar/sidebarFilters.js b/client/components/sidebar/sidebarFilters.js
index bdecd63e7..50e76200f 100644
--- a/client/components/sidebar/sidebarFilters.js
+++ b/client/components/sidebar/sidebarFilters.js
@@ -95,6 +95,7 @@ BlazeComponent.extendComponent({
       },
       'click .js-archive-selection'() {
         mutateSelectedCards('archive');
+        EscapeActions.executeUpTo('multiselection');
       },
     }];
   },
diff --git a/i18n/en.i18n.json b/i18n/en.i18n.json
index 04c0959f7..f3838a250 100644
--- a/i18n/en.i18n.json
+++ b/i18n/en.i18n.json
@@ -183,9 +183,7 @@
     "list-move-cards": "Move all cards in this list",
     "list-select-cards": "Select all cards in this list",
     "listActionPopup-title": "List Actions",
-    "listArchiveCardsPopup-title": "Archive All Cards in this List?",
     "listImportCardPopup-title": "Import a Trello card",
-    "listMoveCardsPopup-title": "Move All Cards in List",
     "lists": "Lists",
     "log-out": "Log Out",
     "loginPopup-title": "Log In",