diff --git a/cockatrice/src/client/ui/widgets/visual_deck_storage/visual_deck_storage_widget.cpp b/cockatrice/src/client/ui/widgets/visual_deck_storage/visual_deck_storage_widget.cpp
index 80cfa3500..b98456144 100644
--- a/cockatrice/src/client/ui/widgets/visual_deck_storage/visual_deck_storage_widget.cpp
+++ b/cockatrice/src/client/ui/widgets/visual_deck_storage/visual_deck_storage_widget.cpp
@@ -69,6 +69,13 @@ VisualDeckStorageWidget::VisualDeckStorageWidget(QWidget *parent) : QWidget(pare
     }
 }
 
+void VisualDeckStorageWidget::resizeEvent(QResizeEvent *event)
+{
+    QWidget::resizeEvent(event);
+    scrollArea->widget()->setMaximumWidth(scrollArea->viewport()->width());
+    scrollArea->widget()->adjustSize();
+}
+
 void VisualDeckStorageWidget::retranslateUi()
 {
     databaseLoadIndicator->setText(tr("Loading database ..."));
@@ -89,6 +96,8 @@ void VisualDeckStorageWidget::refreshBannerCards()
 {
     folderWidget = new VisualDeckStorageFolderDisplayWidget(this, this, SettingsCache::instance().getDeckPath(), false);
     scrollArea->setWidget(folderWidget);
+    scrollArea->widget()->setMaximumWidth(scrollArea->viewport()->width());
+    scrollArea->widget()->adjustSize();
 }
 
 void VisualDeckStorageWidget::updateSortOrder()
diff --git a/cockatrice/src/client/ui/widgets/visual_deck_storage/visual_deck_storage_widget.h b/cockatrice/src/client/ui/widgets/visual_deck_storage/visual_deck_storage_widget.h
index 5dad013ad..563b269d0 100644
--- a/cockatrice/src/client/ui/widgets/visual_deck_storage/visual_deck_storage_widget.h
+++ b/cockatrice/src/client/ui/widgets/visual_deck_storage/visual_deck_storage_widget.h
@@ -36,6 +36,7 @@ public slots:
     void updateColorFilter();
     void updateSearchFilter();
     void updateSortOrder();
+    void resizeEvent(QResizeEvent *event) override;
 
 signals:
     void bannerCardsRefreshed();