diff --git a/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_folder_display_widget.cpp b/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_folder_display_widget.cpp
index 90440beed..911f3dee9 100644
--- a/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_folder_display_widget.cpp
+++ b/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_folder_display_widget.cpp
@@ -126,6 +126,11 @@ void VisualDeckStorageFolderDisplayWidget::continueDeckPass()
 
         const bool matches = index.data(VisualDeckStorageRoles::FilterMatchRole).toBool();
         deckPreviewWidget->setVisible(matches);
+        if (!matches) {
+            // A deck that no longer matches the filters is dropped from the selection so its
+            // highlight cannot linger on an invisible preview or be counted in the share.
+            deckPreviewWidget->setShareSelected(false);
+        }
         if (matches) {
             ++visibleDeckCount;
         }
diff --git a/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.cpp b/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.cpp
index 5ec57c360..bd167ec5b 100644
--- a/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.cpp
+++ b/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.cpp
@@ -194,7 +194,9 @@ QStringList VisualDeckStorageWidget::selectedFilePaths() const
     if (folderWidget != nullptr) {
         const auto previews = folderWidget->findChildren<DeckPreviewWidget *>();
         for (DeckPreviewWidget *preview : previews) {
-            if (preview->isShareSelected()) {
+            // Filtered-out previews stay alive hidden in their sorted place, so only decks the
+            // user can actually see are part of the share.
+            if (preview->isVisible() && preview->isShareSelected()) {
                 selectedPaths.append(preview->filePath);
             }
         }