diff --git a/cockatrice/src/game/deckview/tabbed_deck_view_container.cpp b/cockatrice/src/game/deckview/tabbed_deck_view_container.cpp
index c60e55078..fc3c63acf 100644
--- a/cockatrice/src/game/deckview/tabbed_deck_view_container.cpp
+++ b/cockatrice/src/game/deckview/tabbed_deck_view_container.cpp
@@ -12,6 +12,7 @@ TabbedDeckViewContainer::TabbedDeckViewContainer(int _playerId, TabGame *parent)
     playerDeckView = new DeckViewContainer(playerId, parentGame);
     int playerTabIndex = addTab(playerDeckView, "Your Deck");
     tabBar()->setTabButton(playerTabIndex, QTabBar::RightSide, nullptr);
+    updateTabBarVisibility();
 }
 
 void TabbedDeckViewContainer::addOpponentDeckView(const DeckList &opponentDeck, int opponentId, QString opponentName)
@@ -26,6 +27,7 @@ void TabbedDeckViewContainer::addOpponentDeckView(const DeckList &opponentDeck,
 
         opponentDeckViews.insert(opponentId, opponentDeckView);
     }
+    updateTabBarVisibility();
 }
 
 void TabbedDeckViewContainer::closeTab(int index)
@@ -49,4 +51,14 @@ void TabbedDeckViewContainer::closeTab(int index)
 
     removeTab(index);
     widgetToClose->deleteLater();
+    updateTabBarVisibility();
+}
+
+void TabbedDeckViewContainer::updateTabBarVisibility()
+{
+    if (tabBar()->count() <= 1) {
+        tabBar()->hide();
+    } else {
+        tabBar()->show();
+    }
 }
diff --git a/cockatrice/src/game/deckview/tabbed_deck_view_container.h b/cockatrice/src/game/deckview/tabbed_deck_view_container.h
index 2efc0e758..4b4769ece 100644
--- a/cockatrice/src/game/deckview/tabbed_deck_view_container.h
+++ b/cockatrice/src/game/deckview/tabbed_deck_view_container.h
@@ -11,6 +11,7 @@ class TabbedDeckViewContainer : public QTabWidget
 public:
     explicit TabbedDeckViewContainer(int _playerId, TabGame *parent);
     void closeTab(int index);
+    void updateTabBarVisibility();
     void addOpponentDeckView(const DeckList &opponentDeck, int opponentId, QString opponentName);
     int playerId;
     TabGame *parentGame;