diff --git a/src/qtquick/qml/Dialog.qml b/src/qtquick/qml/Dialog.qml
index 95e61804..2bd0c6e7 100644
--- a/src/qtquick/qml/Dialog.qml
+++ b/src/qtquick/qml/Dialog.qml
@@ -1,110 +1,116 @@
 /*
  * Copyright (C) 2019 Dan Leinir Turthra Jensen <admin@leinir.dk>
  *
  * 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) version 3, or any
  * later version accepted by the membership of KDE e.V. (or its
  * successor approved by the membership of KDE e.V.), which shall
  * act as a proxy defined in Section 6 of version 3 of the license.
  *
  * 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/>.
  *
  */
 
 /**
  * @brief A dialog which has a NewStuff.Page at the base
  *
  * This component is equivalent to the old DownloadDialog, but you should consider
  * using NewStuff.Page instead for a more modern style of integration into your
  * application's flow.
  * @see KNewStuff::DownloadDialog
  * @since 5.63
  */
 
 import QtQuick 2.11
 import QtQuick.Controls 2.5 as QtControls
 import QtQuick.Layouts 1.11 as QtLayouts
 import QtQuick.Dialogs 1.3 as QtDialogs
 
+import org.kde.kirigami 2.7 as Kirigami
 import org.kde.newstuff 1.62 as NewStuff
 
 QtDialogs.Dialog {
     id: component
 
     /**
      * The configuration file to use for this button
      */
     property alias configFile: newStuffPage.configFile
 
     /**
      * Set the text that should appear as the dialog's title. Will be set as
      * i18n("Download New %1").
      *
      * @default The name defined by your knsrc config file
      * @note For the sake of consistency, you should NOT override the title property, just set this one
      */
     property string downloadNewWhat: engine.name
     title: component.downloadNewWhat.length > 0 ? i18nc("The dialog title when we know which type of stuff is being requested", "Download New %1", component.downloadNewWhat) : i18nc("A placeholder title used in the dialog when there is no better title available", "Download New Stuff")
 
     /**
      * The engine which handles the content in this dialog
      */
     property alias engine: newStuffPage.engine
 
     /**
      * The default view mode of the dialog spawned by this button. This should be
      * set using the NewStuff.Page.ViewMode enum
      * @see NewStuff.Page.ViewMode
      */
     property alias viewMode: newStuffPage.viewMode
 
     /**
      * emitted when the Hot New Stuff dialog is about to be shown, usually
      * as a result of the user having click on the button
      */
     signal aboutToShowDialog();
 
     /**
      * Contains the entries which have been changed.
      * @note This is cleared when the dialog is shown, so the changed entries are those
      * changed since the dialog was opened most recently (rather than the lifetime
      * of the instance of the Dialog component)
      */
     property alias changedEntries: component.engine.changedEntries
 
     onVisibleChanged: {
         if (visible === true) {
             newStuffPage.engine.resetChangedEntries();
         }
     }
 
-    contentItem: QtLayouts.ColumnLayout {
+    contentItem: Rectangle {
+        color: Kirigami.Theme.backgroundColor
+        implicitWidth: 700
+        implicitHeight: 540
+        Keys.onEscapePressed: component.close()
         NewStuff.DialogContent {
             id: newStuffPage
-            QtLayouts.Layout.fillWidth: true
-            QtLayouts.Layout.fillHeight: true
+            anchors {
+                top: parent.top
+                left: parent.left
+                right: parent.right
+                bottom: buttonBox.top
+            }
             downloadNewWhat: component.downloadNewWhat
         }
         QtControls.DialogButtonBox {
-            QtLayouts.Layout.fillWidth: true
-            QtControls.Button {
-                action: QtControls.Action {
-                    text: i18n("Close")
-                    shortcut: "esc"
-                    onTriggered: {
-                        component.close();
-                    }
-                }
-                QtControls.DialogButtonBox.buttonRole: QtControls.DialogButtonBox.RejectRole // this is a close button, dialog close buttons have a rejection role...
+            id: buttonBox
+            anchors {
+                left: parent.left
+                right: parent.right
+                bottom: parent.bottom
             }
+            standardButtons: QtControls.DialogButtonBox.Close
+            onRejected: component.close()
         }
     }
 }