diff --git a/Modules/samba/main.cpp b/Modules/samba/main.cpp
index be69f5c..f206384 100644
--- a/Modules/samba/main.cpp
+++ b/Modules/samba/main.cpp
@@ -1,79 +1,98 @@
 /*
     SPDX-FileCopyrightText: 2020 Harald Sitter <sitter@kde.org>
     SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL
 */
 
 #include <QTableView>
 #include <QHeaderView>
 #include <QVBoxLayout>
 #include <KCModule>
 #include <KPluginFactory>
 #include <KLocalizedString>
 #include <KAboutData>
 #include <KTitleWidget>
 
 #include "ksambasharemodel.h"
 #include "smbmountmodel.h"
 
 class SambaContainer : public KCModule {
 Q_OBJECT
 public:
     SambaContainer(QWidget *parent = nullptr, const QVariantList &list = QVariantList());
     ~SambaContainer() override = default;
 
 private:
     QTableView *addTableView(const QString &localizedLabel, QAbstractListModel *model);
 };
 
 K_PLUGIN_FACTORY(SambaFactory,
 		registerPlugin<SambaContainer>();
 )
 
 SambaContainer::SambaContainer(QWidget *parent, const QVariantList &)
     : KCModule(parent)
 {
     KAboutData *about = new KAboutData(i18n("kcmsamba"),
                                        i18n("System Information Control Module"),
                                        QString(), QString(), KAboutLicense::GPL,
                                        i18n("(c) 2002 KDE Information Control Module Samba Team"));
     about->addAuthor(i18n("Michael Glauche"), QString(), QStringLiteral("glauche@isa.rwth-aachen.de"));
     about->addAuthor(i18n("Matthias Hoelzer"), QString(), QStringLiteral("hoelzer@kde.org"));
 	about->addAuthor(i18n("David Faure"), QString(), QStringLiteral("faure@kde.org"));
 	about->addAuthor(i18n("Harald Koschinski"), QString(), QStringLiteral("Harald.Koschinski@arcormail.de"));
 	about->addAuthor(i18n("Wilco Greven"), QString(), QStringLiteral("greven@kde.org"));
 	about->addAuthor(i18n("Alexander Neundorf"), QString(), QStringLiteral("neundorf@kde.org"));
     about->addAuthor(i18n("Harald Sitter"), QString(), QStringLiteral("sitter@kde.org"));
 	setAboutData(about);
 
     QVBoxLayout *layout = new QVBoxLayout(this);
     Q_ASSERT(this->layout());
     setLayout(layout);
 
     addTableView(i18nc("@title/group", "Exported Shares"), new KSambaShareModel(this));
 
     auto importsView = addTableView(i18nc("@title/group", "Mounted Shares"), new SmbMountModel(this));
     importsView->horizontalHeader()->setSectionResizeMode(static_cast<int>(SmbMountModel::ColumnRole::Accessible),
                                                           QHeaderView::ResizeToContents);
 
     setButtons(Help);
 }
 
 QTableView *SambaContainer::addTableView(const QString &localizedLabel, QAbstractListModel *model)
 {
     auto title = new KTitleWidget(this);
     title->setText(localizedLabel);
     title->setLevel(2);
     layout()->addWidget(title);
 
     auto view = new QTableView(this);
     layout()->addWidget(view);
     view->setModel(model);
+
+    // Stretching is a bit awkward because it allows resizing below the sizeHint of
+    // the header, effectively cutting off the text. This is made worse by kcmshell
+    // which rather unfortunately stacks scrollviews so size hinting is lost along
+    // the way allowing the actual window to be (even by default) smaller than
+    // what our preferred hint is. To mitigate this problem we manually make
+    // the sizeHint's width the minimal size. This is kind of like QSizePolicy::Minimum.
+    // https://bugs.kde.org/show_bug.cgi?id=419786
+    int maxSectionRequirement = 0;
+    for (auto i = 0; i < view->model()->columnCount(); ++i) {
+        const int hint = view->horizontalHeader()->sectionSizeHint(i);
+        maxSectionRequirement = qMax<int>(maxSectionRequirement, hint);
+    }
+    view->horizontalHeader()->setMinimumSectionSize(maxSectionRequirement);
+    // Combined with the minimum section size this makes sure the default size will
+    // be minimal sufficient regardless of parent sizing policies and model content
+    // i.e. an empty view will still have fine spacing for header text.
+    view->setSizeAdjustPolicy(QAbstractScrollArea::AdjustToContentsOnFirstShow);
+
     view->horizontalHeader()->setSectionResizeMode(QHeaderView::Stretch);
     view->horizontalHeader()->reset();
     view->horizontalHeader()->setVisible(true);
     view->verticalHeader()->setVisible(false);
 
     return view;
 }
 
 #include "main.moc"