diff --git a/cockatrice/src/client/tabs/abstract_tab_deck_editor.cpp b/cockatrice/src/client/tabs/abstract_tab_deck_editor.cpp
index 89014c5f0..94a5139fb 100644
--- a/cockatrice/src/client/tabs/abstract_tab_deck_editor.cpp
+++ b/cockatrice/src/client/tabs/abstract_tab_deck_editor.cpp
@@ -62,6 +62,9 @@ AbstractTabDeckEditor::AbstractTabDeckEditor(TabSupervisor *_tabSupervisor) : Ta
     connect(databaseDisplayDockWidget, &DeckEditorDatabaseDisplayWidget::decrementCardFromSideboard, this,
             &AbstractTabDeckEditor::actDecrementCardFromSideboard);
 
+    connect(filterDockWidget, &DeckEditorFilterDockWidget::clearAllDatabaseFilters, databaseDisplayDockWidget,
+            &DeckEditorDatabaseDisplayWidget::clearAllDatabaseFilters);
+
     connect(&SettingsCache::instance().shortcuts(), SIGNAL(shortCutChanged()), this, SLOT(refreshShortcuts()));
 }
 
diff --git a/cockatrice/src/client/ui/widgets/deck_editor/deck_editor_database_display_widget.cpp b/cockatrice/src/client/ui/widgets/deck_editor/deck_editor_database_display_widget.cpp
index f239debb4..b21062245 100644
--- a/cockatrice/src/client/ui/widgets/deck_editor/deck_editor_database_display_widget.cpp
+++ b/cockatrice/src/client/ui/widgets/deck_editor/deck_editor_database_display_widget.cpp
@@ -124,6 +124,12 @@ void DeckEditorDatabaseDisplayWidget::updateSearch(const QString &search)
                                                         QItemSelectionModel::SelectCurrent | QItemSelectionModel::Rows);
 }
 
+void DeckEditorDatabaseDisplayWidget::clearAllDatabaseFilters()
+{
+    databaseDisplayModel->clearFilterAll();
+    searchEdit->setText("");
+}
+
 void DeckEditorDatabaseDisplayWidget::updateCard(const QModelIndex &current, const QModelIndex & /*previous*/)
 {
     const QString cardName = current.sibling(current.row(), 0).data().toString();
diff --git a/cockatrice/src/client/ui/widgets/deck_editor/deck_editor_database_display_widget.h b/cockatrice/src/client/ui/widgets/deck_editor/deck_editor_database_display_widget.h
index bb587f72d..9022a2cb7 100644
--- a/cockatrice/src/client/ui/widgets/deck_editor/deck_editor_database_display_widget.h
+++ b/cockatrice/src/client/ui/widgets/deck_editor/deck_editor_database_display_widget.h
@@ -24,6 +24,7 @@ public:
 public slots:
     CardInfoPtr currentCardInfo() const;
     void setFilterTree(FilterTree *filterTree);
+    void clearAllDatabaseFilters();
 
 signals:
     void addCardToMainDeck(CardInfoPtr card);
diff --git a/cockatrice/src/client/ui/widgets/deck_editor/deck_editor_filter_dock_widget.cpp b/cockatrice/src/client/ui/widgets/deck_editor/deck_editor_filter_dock_widget.cpp
index 8bfc5342e..2f03ad656 100644
--- a/cockatrice/src/client/ui/widgets/deck_editor/deck_editor_filter_dock_widget.cpp
+++ b/cockatrice/src/client/ui/widgets/deck_editor/deck_editor_filter_dock_widget.cpp
@@ -115,8 +115,7 @@ void DeckEditorFilterDockWidget::filterRemove(QAction *action)
 
 void DeckEditorFilterDockWidget::actClearFilterAll()
 {
-    deckEditor->databaseDisplayDockWidget->databaseDisplayModel->clearFilterAll();
-    deckEditor->databaseDisplayDockWidget->searchEdit->setText("");
+    emit clearAllDatabaseFilters();
 }
 
 void DeckEditorFilterDockWidget::actClearFilterOne()
diff --git a/cockatrice/src/client/ui/widgets/deck_editor/deck_editor_filter_dock_widget.h b/cockatrice/src/client/ui/widgets/deck_editor/deck_editor_filter_dock_widget.h
index 861ed9865..3113b2e24 100644
--- a/cockatrice/src/client/ui/widgets/deck_editor/deck_editor_filter_dock_widget.h
+++ b/cockatrice/src/client/ui/widgets/deck_editor/deck_editor_filter_dock_widget.h
@@ -18,6 +18,9 @@ public:
     void retranslateUi();
     QAction *aClearFilterAll, *aClearFilterOne;
 
+signals:
+    void clearAllDatabaseFilters();
+
 private:
     AbstractTabDeckEditor *deckEditor;
     FilterTreeModel *filterModel;