diff --git a/cockatrice/src/client/tabs/tab.cpp b/cockatrice/src/client/tabs/tab.cpp
index 7b316dfe6..d31b86bc9 100644
--- a/cockatrice/src/client/tabs/tab.cpp
+++ b/cockatrice/src/client/tabs/tab.cpp
@@ -4,6 +4,7 @@
 #include "./tab_supervisor.h"
 
 #include <QApplication>
+#include <QCloseEvent>
 #include <QDebug>
 #include <QScreen>
 
@@ -43,6 +44,15 @@ void Tab::deleteCardInfoPopup(const QString &cardName)
     }
 }
 
+/**
+ * Overrides the closeEvent in order to emit a close signal
+ */
+void Tab::closeEvent(QCloseEvent *event)
+{
+    emit closed();
+    event->accept();
+}
+
 void Tab::closeRequest(bool /*forced*/)
 {
     close();
diff --git a/cockatrice/src/client/tabs/tab.h b/cockatrice/src/client/tabs/tab.h
index cec40c373..f82f9a7b2 100644
--- a/cockatrice/src/client/tabs/tab.h
+++ b/cockatrice/src/client/tabs/tab.h
@@ -13,6 +13,12 @@ class Tab : public QMainWindow
 signals:
     void userEvent(bool globalEvent = true);
     void tabTextChanged(Tab *tab, const QString &newTabText);
+    /**
+     * Emitted when the tab is closed (because Qt doesn't provide a built-in close signal)
+     * This signal is emitted from this class's overridden Tab::closeEvent method.
+     * Make sure any subclasses that override closeEvent still emit this signal from there.
+     */
+    void closed();
 
 protected:
     TabSupervisor *tabSupervisor;
@@ -23,6 +29,7 @@ protected:
 protected slots:
     void showCardInfoPopup(const QPoint &pos, const QString &cardName, const QString &providerId);
     void deleteCardInfoPopup(const QString &cardName);
+    void closeEvent(QCloseEvent *event) override;
 
 private:
     QString currentCardName, currentProviderId;
diff --git a/cockatrice/src/client/tabs/tab_supervisor.cpp b/cockatrice/src/client/tabs/tab_supervisor.cpp
index 495bcc5c3..52baacb21 100644
--- a/cockatrice/src/client/tabs/tab_supervisor.cpp
+++ b/cockatrice/src/client/tabs/tab_supervisor.cpp
@@ -393,7 +393,7 @@ void TabSupervisor::actTabServer(bool checked)
         tabServer = new TabServer(this, client);
         connect(tabServer, &TabServer::roomJoined, this, &TabSupervisor::addRoomTab);
         myAddTab(tabServer);
-        connect(tabServer, &Tab::destroyed, this, [this] {
+        connect(tabServer, &Tab::closed, this, [this] {
             tabServer = nullptr;
             aTabServer->setChecked(false);
         });
@@ -410,7 +410,7 @@ void TabSupervisor::actTabUserLists(bool checked)
         connect(tabUserLists, &TabUserLists::userJoined, this, &TabSupervisor::processUserJoined);
         connect(tabUserLists, &TabUserLists::userLeft, this, &TabSupervisor::processUserLeft);
         myAddTab(tabUserLists);
-        connect(tabUserLists, &Tab::destroyed, this, [this] {
+        connect(tabUserLists, &Tab::closed, this, [this] {
             tabUserLists = nullptr;
             aTabUserLists->setChecked(false);
         });
@@ -425,7 +425,7 @@ void TabSupervisor::actTabDeckStorage(bool checked)
         tabDeckStorage = new TabDeckStorage(this, client);
         connect(tabDeckStorage, &TabDeckStorage::openDeckEditor, this, &TabSupervisor::addDeckEditorTab);
         myAddTab(tabDeckStorage);
-        connect(tabDeckStorage, &Tab::destroyed, this, [this] {
+        connect(tabDeckStorage, &Tab::closed, this, [this] {
             tabDeckStorage = nullptr;
             aTabDeckStorage->setChecked(false);
         });
@@ -440,7 +440,7 @@ void TabSupervisor::actTabReplays(bool checked)
         tabReplays = new TabReplays(this, client);
         connect(tabReplays, &TabReplays::openReplay, this, &TabSupervisor::openReplay);
         myAddTab(tabReplays);
-        connect(tabReplays, &Tab::destroyed, this, [this] {
+        connect(tabReplays, &Tab::closed, this, [this] {
             tabReplays = nullptr;
             aTabReplays->setChecked(false);
         });
@@ -455,7 +455,7 @@ void TabSupervisor::actTabAdmin(bool checked)
         tabAdmin = new TabAdmin(this, client, (userInfo->user_level() & ServerInfo_User::IsAdmin));
         connect(tabAdmin, &TabAdmin::adminLockChanged, this, &TabSupervisor::adminLockChanged);
         myAddTab(tabAdmin);
-        connect(tabAdmin, &Tab::destroyed, this, [this] {
+        connect(tabAdmin, &Tab::closed, this, [this] {
             tabAdmin = nullptr;
             aTabAdmin->setChecked(false);
         });
@@ -469,7 +469,7 @@ void TabSupervisor::actTabLog(bool checked)
     if (checked && !tabLog) {
         tabLog = new TabLog(this, client);
         myAddTab(tabLog);
-        connect(tabLog, &Tab::destroyed, this, [this] {
+        connect(tabLog, &Tab::closed, this, [this] {
             tabLog = nullptr;
             aTabAdmin->setChecked(false);
         });