diff --git a/src/downloaddialog.cpp b/src/downloaddialog.cpp
index 81747103..39ed0ad7 100644
--- a/src/downloaddialog.cpp
+++ b/src/downloaddialog.cpp
@@ -1,167 +1,170 @@
 /*
     knewstuff3/ui/downloaddialog.cpp.
     Copyright (C) 2005 by Enrico Ros <eros.kde@email.it>
     Copyright (C) 2005 - 2007 Josef Spillner <spillner@kde.org>
     Copyright (C) 2007 Dirk Mueller <mueller@kde.org>
     Copyright (C) 2007-2009 Jeremy Whiting <jpwhiting@kde.org>
     Copyright (C) 2009-2010 Frederik Gladhorn <gladhorn@kde.org>
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Lesser General Public
     License as published by the Free Software Foundation; either
     version 2.1 of the License, or (at your option) any later version.
 
     This library is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
     Lesser General Public License for more details.
 
     You should have received a copy of the GNU Lesser General Public
     License along with this library.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "downloaddialog.h"
 
 #include <QTimer>
 #include <QSortFilterProxyModel>
 #include <QScrollBar>
 #include <QKeyEvent>
 
 #include <ksharedconfig.h>
 #include <ktitlewidget.h>
 #include <kwindowconfig.h>
 #include <QCoreApplication>
 #include <kstandardguiitem.h>
 #include <klocalizedstring.h>
 #include <kauthorized.h>
 #include <kmessagebox.h>
 
 #include "downloadwidget.h"
 #include "downloadwidget_p.h"
 #include "ui/widgetquestionlistener.h"
 
 namespace KNS3
 {
 class DownloadDialogPrivate
 {
 public:
     ~DownloadDialogPrivate()
     {
         delete downloadWidget;
     }
 
     DownloadWidget *downloadWidget = nullptr;
 };
 }
 
 using namespace KNS3;
 
 const char ConfigGroup[] = "DownloadDialog Settings";
 
 DownloadDialog::DownloadDialog(QWidget *parent)
     : QDialog(parent)
     , d(new DownloadDialogPrivate)
 {
     const QString name = QCoreApplication::applicationName();
     init(name + QStringLiteral(".knsrc"));
 }
 
 DownloadDialog::DownloadDialog(const QString &configFile, QWidget *parent)
     : QDialog(parent)
     , d(new DownloadDialogPrivate)
 {
     init(configFile);
 }
 
 void DownloadDialog::init(const QString &configFile)
 {
     // load the last size from config
     KConfigGroup group(KSharedConfig::openConfig(), ConfigGroup);
     KWindowConfig::restoreWindowSize(windowHandle(), group);
     setMinimumSize(700, 400);
 
     setWindowTitle(i18n("Get Hot New Stuff"));
 
     QVBoxLayout *layout = new QVBoxLayout(this);
-    layout->setMargin(0); // DownloadWidget already provides margins
     d->downloadWidget = new DownloadWidget(configFile, this);
+    // DownloadWidget already provides margins, which would duplicate the dialog layout margins.
+    // As the widget theme could use different margin sizes for a dialog/window outer layout,
+    // so from the duplicated margins we pick the internal margins to remove here.
+    d->downloadWidget->layout()->setMargin(0);
     layout->addWidget(d->downloadWidget);
 
     if (group.hasKey("Name")) {
         d->downloadWidget->setTitle(group.readEntry("Name"));
     } else {
         QString displayName = QGuiApplication::applicationDisplayName();
         if (displayName.isEmpty()) {
             displayName = QCoreApplication::applicationName();
         }
         d->downloadWidget->setTitle(i18nc("Program name followed by 'Add On Installer'",
             "%1 Add-On Installer", displayName));
     }
     //d->downloadWidget->d->ui.m_titleWidget->setPixmap(QIcon::fromTheme(KGlobal::activeComponent().aboutData()->programIconName()));
     d->downloadWidget->d->ui.m_titleWidget->setVisible(true);
     d->downloadWidget->d->ui.closeButton->setVisible(true);
     KStandardGuiItem::assign(d->downloadWidget->d->ui.closeButton, KStandardGuiItem::Close);
     d->downloadWidget->d->dialogMode = true;
     connect(d->downloadWidget->d->ui.closeButton, &QAbstractButton::clicked, this, &QDialog::accept);
     WidgetQuestionListener::instance();
 }
 
 DownloadDialog::~DownloadDialog()
 {
     KConfigGroup group(KSharedConfig::openConfig(), ConfigGroup);
     KWindowConfig::saveWindowSize(windowHandle(), group, KConfigBase::Persistent);
     delete d;
 }
 
 int DownloadDialog::exec()
 {
     if (!KAuthorized::authorize(QStringLiteral("ghns"))) {
         KMessageBox::information(this, QStringLiteral("Get Hot New Stuff is disabled by the administrator"), QStringLiteral("Get Hot New Stuff disabled"));
         return QDialog::Rejected;
     }
     return QDialog::exec();
 }
 
 void DownloadDialog::open()
 {
     if (!KAuthorized::authorize(QStringLiteral("ghns"))) {
         KMessageBox::information(this, QStringLiteral("Get Hot New Stuff is disabled by the administrator"), QStringLiteral("Get Hot New Stuff disabled"));
         return;
     }
     QDialog::open();
 }
 
 void DownloadDialog::showEvent(QShowEvent *event)
 {
     if (!KAuthorized::authorize(QStringLiteral("ghns"))) {
         KMessageBox::information(this, QStringLiteral("Get Hot New Stuff is disabled by the administrator"), QStringLiteral("Get Hot New Stuff disabled"));
         return;
     }
     QWidget::showEvent(event);
 }
 
 void DownloadDialog::setTitle(const QString &title)
 {
     d->downloadWidget->setTitle(title);
 }
 
 QString DownloadDialog::title() const
 {
     return d->downloadWidget->title();
 }
 
 KNSCore::Engine *DownloadDialog::engine()
 {
     return d->downloadWidget->engine();
 }
 
 Entry::List DownloadDialog::changedEntries()
 {
     return d->downloadWidget->changedEntries();
 }
 
 Entry::List DownloadDialog::installedEntries()
 {
     return d->downloadWidget->installedEntries();
 }