diff --git a/cockatrice/src/client/tabs/tab_deck_editor.cpp b/cockatrice/src/client/tabs/tab_deck_editor.cpp
index b4472e32c..a400b6fea 100644
--- a/cockatrice/src/client/tabs/tab_deck_editor.cpp
+++ b/cockatrice/src/client/tabs/tab_deck_editor.cpp
@@ -46,13 +46,13 @@ TabDeckEditor::TabDeckEditor(TabSupervisor *_tabSupervisor) : TabGenericDeckEdit
 
     databaseDisplayDockWidget = new DeckEditorDatabaseDisplayWidget(this, this);
     deckDockWidget = new DeckEditorDeckDockWidget(this, this);
-    cardInfoDockWidget = new DeckEditorCardInfoDockWidget(this);
+    cardInfoDockWidget = new DeckEditorCardInfoDockWidget(this, this);
     filterDockWidget = new DeckEditorFilterDockWidget(this, this);
     printingSelectorDockWidget = new DeckEditorPrintingSelectorDockWidget(this, this);
 
     TabDeckEditor::createMenus();
 
-    this->installEventFilter(this);
+    installEventFilter(this);
 
     TabDeckEditor::retranslateUi();
     connect(&SettingsCache::instance().shortcuts(), SIGNAL(shortCutChanged()), this, SLOT(refreshShortcuts()));
diff --git a/cockatrice/src/client/tabs/tab_generic_deck_editor.h b/cockatrice/src/client/tabs/tab_generic_deck_editor.h
index d062d3605..41d2984eb 100644
--- a/cockatrice/src/client/tabs/tab_generic_deck_editor.h
+++ b/cockatrice/src/client/tabs/tab_generic_deck_editor.h
@@ -24,6 +24,7 @@ class CardInfoFrameWidget;
 class QTextEdit;
 class QLabel;
 class DeckLoader;
+class DeckEditorCardInfoDockWidget;
 class DeckEditorDatabaseDisplayWidget;
 class DeckEditorDeckDockWidget;
 class DeckEditorFilterDockWidget;
diff --git a/cockatrice/src/client/ui/widgets/deck_editor/deck_editor_card_info_dock_widget.cpp b/cockatrice/src/client/ui/widgets/deck_editor/deck_editor_card_info_dock_widget.cpp
index 81909d4c1..f21ff1fc9 100644
--- a/cockatrice/src/client/ui/widgets/deck_editor/deck_editor_card_info_dock_widget.cpp
+++ b/cockatrice/src/client/ui/widgets/deck_editor/deck_editor_card_info_dock_widget.cpp
@@ -30,7 +30,7 @@ void DeckEditorCardInfoDockWidget::createCardInfoDock()
     cardInfoDockContents->setLayout(cardInfoFrame);
     setWidget(cardInfoDockContents);
 
-    installEventFilter(this);
+    installEventFilter(deckEditor);
     connect(this, &QDockWidget::topLevelChanged, deckEditor, &TabGenericDeckEditor::dockTopLevelChanged);
 }
 
diff --git a/cockatrice/src/client/ui/widgets/deck_editor/deck_editor_card_info_dock_widget.h b/cockatrice/src/client/ui/widgets/deck_editor/deck_editor_card_info_dock_widget.h
index a60155fc1..6f62f94bf 100644
--- a/cockatrice/src/client/ui/widgets/deck_editor/deck_editor_card_info_dock_widget.h
+++ b/cockatrice/src/client/ui/widgets/deck_editor/deck_editor_card_info_dock_widget.h
@@ -6,6 +6,7 @@
 
 #include <QDockWidget>
 
+class TabGenericDeckEditor;
 class DeckEditorCardInfoDockWidget : public QDockWidget
 {
     Q_OBJECT
diff --git a/cockatrice/src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp b/cockatrice/src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp
index 93809c95e..107a4807b 100644
--- a/cockatrice/src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp
+++ b/cockatrice/src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp
@@ -19,7 +19,7 @@ DeckEditorDeckDockWidget::DeckEditorDeckDockWidget(QWidget *parent, TabGenericDe
     setAllowedAreas(Qt::LeftDockWidgetArea | Qt::RightDockWidgetArea);
     setFeatures(QDockWidget::DockWidgetClosable | QDockWidget::DockWidgetFloatable | QDockWidget::DockWidgetMovable);
 
-    installEventFilter(this);
+    installEventFilter(deckEditor);
     connect(this, SIGNAL(topLevelChanged(bool)), deckEditor, SLOT(dockTopLevelChanged(bool)));
     createDeckDock();
 }
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 3b2c38378..ab9574927 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
@@ -81,7 +81,7 @@ void DeckEditorFilterDockWidget::createFiltersDock()
     filterDockContents->setLayout(filterFrame);
     setWidget(filterDockContents);
 
-    installEventFilter(this);
+    installEventFilter(deckEditor);
     connect(this, &QDockWidget::topLevelChanged, deckEditor, &TabGenericDeckEditor::dockTopLevelChanged);
 }
 
diff --git a/cockatrice/src/client/ui/widgets/deck_editor/deck_editor_printing_selector_dock_widget.cpp b/cockatrice/src/client/ui/widgets/deck_editor/deck_editor_printing_selector_dock_widget.cpp
index 7f02df244..ab2be7350 100644
--- a/cockatrice/src/client/ui/widgets/deck_editor/deck_editor_printing_selector_dock_widget.cpp
+++ b/cockatrice/src/client/ui/widgets/deck_editor/deck_editor_printing_selector_dock_widget.cpp
@@ -32,7 +32,7 @@ void DeckEditorPrintingSelectorDockWidget::createPrintingSelectorDock()
     printingSelectorDockContents->setLayout(printingSelectorFrame);
     setWidget(printingSelectorDockContents);
 
-    installEventFilter(this);
+    installEventFilter(deckEditor);
     connect(this, &QDockWidget::topLevelChanged, deckEditor, &TabGenericDeckEditor::dockTopLevelChanged);
 }