diff --git a/cockatrice/src/client/tabs/tab_generic_deck_editor.cpp b/cockatrice/src/client/tabs/tab_generic_deck_editor.cpp
index 94838b41b..ed275317a 100644
--- a/cockatrice/src/client/tabs/tab_generic_deck_editor.cpp
+++ b/cockatrice/src/client/tabs/tab_generic_deck_editor.cpp
@@ -20,11 +20,9 @@
 #include <QApplication>
 #include <QClipboard>
 #include <QCloseEvent>
-#include <QComboBox>
 #include <QDebug>
 #include <QDesktopServices>
 #include <QDir>
-#include <QDockWidget>
 #include <QFileDialog>
 #include <QHeaderView>
 #include <QLineEdit>
@@ -35,8 +33,6 @@
 #include <QPushButton>
 #include <QRegularExpression>
 #include <QSplitter>
-#include <QTextBrowser>
-#include <QTextEdit>
 #include <QTextStream>
 #include <QTreeView>
 #include <QUrl>
diff --git a/cockatrice/src/client/tabs/tab_generic_deck_editor.h b/cockatrice/src/client/tabs/tab_generic_deck_editor.h
index f81c9f687..d062d3605 100644
--- a/cockatrice/src/client/tabs/tab_generic_deck_editor.h
+++ b/cockatrice/src/client/tabs/tab_generic_deck_editor.h
@@ -1,7 +1,6 @@
 #ifndef TAB_GENERIC_DECK_EDITOR_H
 #define TAB_GENERIC_DECK_EDITOR_H
 
-#include "../../deck/custom_line_edit.h"
 #include "../../game/cards/card_database.h"
 #include "../menus/deck_editor/deck_editor_menu.h"
 #include "../ui/widgets/deck_editor/deck_editor_card_info_dock_widget.h"
@@ -9,11 +8,9 @@
 #include "../ui/widgets/deck_editor/deck_editor_deck_dock_widget.h"
 #include "../ui/widgets/deck_editor/deck_editor_filter_dock_widget.h"
 #include "../ui/widgets/deck_editor/deck_editor_printing_selector_dock_widget.h"
-#include "../ui/widgets/printing_selector/printing_selector.h"
 #include "../ui/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.h"
 #include "tab.h"
 
-#include <QAbstractItemModel>
 #include <QDir>
 
 class CardDatabaseModel;
@@ -77,7 +74,6 @@ protected slots:
     bool eventFilter(QObject *o, QEvent *e) override;
     virtual void dockVisibleTriggered() = 0;
     virtual void dockFloatingTriggered() = 0;
-    virtual void dockTopLevelChanged(bool topLevel) = 0;
 
 protected:
     /**
@@ -135,6 +131,7 @@ public slots:
     void actOpenRecent(const QString &fileName);     // generic
     void closeRequest(bool forced = false) override; // generic
     virtual void showPrintingSelector() = 0;
+    virtual void dockTopLevelChanged(bool topLevel) = 0;
 signals:
     void openDeckEditor(const DeckLoader *deckLoader);
     void deckEditorClosing(TabGenericDeckEditor *tab);
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 e28719492..81909d4c1 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
@@ -4,7 +4,8 @@
 
 #include <QVBoxLayout>
 
-DeckEditorCardInfoDockWidget::DeckEditorCardInfoDockWidget(QWidget *parent) : QDockWidget(parent)
+DeckEditorCardInfoDockWidget::DeckEditorCardInfoDockWidget(QWidget *parent, TabGenericDeckEditor *_deckEditor)
+    : QDockWidget(parent), deckEditor(_deckEditor)
 {
     setObjectName("cardInfoDock");
 
@@ -30,7 +31,7 @@ void DeckEditorCardInfoDockWidget::createCardInfoDock()
     setWidget(cardInfoDockContents);
 
     installEventFilter(this);
-    // connect(this, SIGNAL(topLevelChanged(bool)), deckEditor, SLOT(dockTopLevelChanged(bool)));
+    connect(this, &QDockWidget::topLevelChanged, deckEditor, &TabGenericDeckEditor::dockTopLevelChanged);
 }
 
 void DeckEditorCardInfoDockWidget::retranslateUi()
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 35149e959..a60155fc1 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
@@ -1,6 +1,7 @@
 #ifndef DECK_EDITOR_CARD_INFO_DOCK_WIDGET_H
 #define DECK_EDITOR_CARD_INFO_DOCK_WIDGET_H
 
+#include "../../../tabs/tab_generic_deck_editor.h"
 #include "../cards/card_info_frame_widget.h"
 
 #include <QDockWidget>
@@ -9,9 +10,11 @@ class DeckEditorCardInfoDockWidget : public QDockWidget
 {
     Q_OBJECT
 public:
-    explicit DeckEditorCardInfoDockWidget(QWidget *parent);
+    explicit DeckEditorCardInfoDockWidget(QWidget *parent, TabGenericDeckEditor *deckEditor);
     void createCardInfoDock();
     void retranslateUi();
+
+    TabGenericDeckEditor *deckEditor;
     CardInfoFrameWidget *cardInfo;
 };
 
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 dda5497d6..3b2c38378 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
@@ -82,7 +82,7 @@ void DeckEditorFilterDockWidget::createFiltersDock()
     setWidget(filterDockContents);
 
     installEventFilter(this);
-    // connect(this, SIGNAL(topLevelChanged(bool)), deckEditor, SLOT(dockTopLevelChanged(bool)));
+    connect(this, &QDockWidget::topLevelChanged, deckEditor, &TabGenericDeckEditor::dockTopLevelChanged);
 }
 
 void DeckEditorFilterDockWidget::filterViewCustomContextMenu(const QPoint &point)
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 3943d413f..7f02df244 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
@@ -33,9 +33,7 @@ void DeckEditorPrintingSelectorDockWidget::createPrintingSelectorDock()
     setWidget(printingSelectorDockContents);
 
     installEventFilter(this);
-    // connect(printingSelectorDock, SIGNAL(topLevelChanged(bool)), this, SLOT(dockTopLevelChanged(bool)));
-
-    // addDockWidget(Qt::RightDockWidgetArea, printingSelectorDock);
+    connect(this, &QDockWidget::topLevelChanged, deckEditor, &TabGenericDeckEditor::dockTopLevelChanged);
 }
 
 void DeckEditorPrintingSelectorDockWidget::retranslateUi()