diff --git a/core/ModuleView.cpp b/core/ModuleView.cpp
--- a/core/ModuleView.cpp
+++ b/core/ModuleView.cpp
@@ -348,6 +348,21 @@
     if (activeModule) {
         KActivities::ResourceInstance::notifyAccessed(QUrl(QStringLiteral("kcm:") + activeModule->moduleInfo().service()->storageId()),
                 QStringLiteral("org.kde.systemsettings"));
+        if (activeModule->realModule() && activeModule->realModule()->inherits("KCModuleQml")) {
+            d->mButtons->setContentsMargins(
+                style()->pixelMetric(QStyle::PM_LayoutLeftMargin),
+                style()->pixelMetric(QStyle::PM_LayoutTopMargin),
+                style()->pixelMetric(QStyle::PM_LayoutRightMargin),
+                style()->pixelMetric(QStyle::PM_LayoutBottomMargin));
+            d->mLayout->setContentsMargins(0, 0, 0, 0);
+        } else {
+            d->mButtons->setContentsMargins(0, 0, 0, 0);
+            d->mLayout->setContentsMargins(
+                style()->pixelMetric(QStyle::PM_LayoutLeftMargin),
+                style()->pixelMetric(QStyle::PM_LayoutTopMargin),
+                style()->pixelMetric(QStyle::PM_LayoutRightMargin),
+                style()->pixelMetric(QStyle::PM_LayoutBottomMargin));
+        }
     }
 }