diff --git a/klipper/configdialog.cpp b/klipper/configdialog.cpp
index 15901992d..808be4e4e 100644
--- a/klipper/configdialog.cpp
+++ b/klipper/configdialog.cpp
@@ -260,17 +260,22 @@ void ActionsWidget::onDeleteAction()
 
 void ActionsWidget::onAdvanced()
 {
-    KDialog dlg(this);
+    QDialog dlg(this);
     dlg.setModal(true);
-    dlg.setCaption( i18n("Advanced Settings") );
-    dlg.setButtons( KDialog::Ok | KDialog::Cancel );
+    dlg.setWindowTitle( i18n("Advanced Settings") );
+    QDialogButtonBox *buttons = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel, &dlg);
+    buttons->button(QDialogButtonBox::Ok)->setShortcut(Qt::CTRL | Qt::Key_Return);
+    connect(buttons, &QDialogButtonBox::accepted, &dlg, &QDialog::accept);
+    connect(buttons, &QDialogButtonBox::rejected, &dlg, &QDialog::reject);
 
     AdvancedWidget *widget = new AdvancedWidget(&dlg);
     widget->setWMClasses( m_exclWMClasses );
 
-    dlg.setMainWidget(widget);
+    QVBoxLayout *layout = new QVBoxLayout(&dlg);
+    layout->addWidget(widget);
+    layout->addWidget(buttons);
 
-    if ( dlg.exec() == KDialog::Accepted ) {
+    if ( dlg.exec() == QDialog::Accepted ) {
         m_exclWMClasses = widget->wmClasses();
     }
 }
diff --git a/klipper/editactiondialog.cpp b/klipper/editactiondialog.cpp
index 4b8fc0c83..4719fc5ec 100644
--- a/klipper/editactiondialog.cpp
+++ b/klipper/editactiondialog.cpp
@@ -22,9 +22,12 @@
 
 #include <QItemDelegate>
 #include <QComboBox>
+#include <QDialogButtonBox>
 
 #include <KDebug>
 #include <KIconLoader>
+#include <kwindowconfig.h>
+#include <KWindowConfig>
 
 #include "urlgrabber.h"
 #include "ui_editactiondialog.h"
@@ -259,10 +262,13 @@ void ActionDetailModel::removeCommand(const QModelIndex& index) {
 }
 
 EditActionDialog::EditActionDialog(QWidget* parent)
-    : KDialog(parent)
+    : QDialog(parent)
 {
-    setCaption(i18n("Action Properties"));
-    setButtons(KDialog::Ok | KDialog::Cancel);
+    setWindowTitle(i18n("Action Properties"));
+    QDialogButtonBox *buttons = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel, this);
+    buttons->button(QDialogButtonBox::Ok)->setShortcut(Qt::CTRL | Qt::Key_Return);
+    connect(buttons, &QDialogButtonBox::accepted, this, &EditActionDialog::slotAccepted);
+    connect(buttons, &QDialogButtonBox::rejected, this, &QDialog::reject);
 
     QWidget* dlgWidget = new QWidget(this);
     m_ui = new Ui::EditActionDialog;
@@ -278,13 +284,16 @@ EditActionDialog::EditActionDialog(QWidget* parent)
     // which is the font height+struts.
     m_ui->twCommandList->verticalHeader()->setDefaultSectionSize(m_ui->twCommandList->verticalHeader()->minimumSectionSize());
     m_ui->twCommandList->horizontalHeader()->setDefaultAlignment(Qt::AlignLeft);
-    setMainWidget(dlgWidget);
+
+    QVBoxLayout *layout = new QVBoxLayout(this);
+    layout->addWidget(dlgWidget);
+    layout->addWidget(buttons);
 
     connect(m_ui->pbAddCommand, SIGNAL(clicked()), SLOT(onAddCommand()) );
     connect(m_ui->pbRemoveCommand, SIGNAL(clicked()), SLOT(onRemoveCommand()) );
 
     const KConfigGroup grp = KSharedConfig::openConfig()->group("EditActionDialog");
-    restoreDialogSize(grp);
+    KWindowConfig::restoreWindowSize(windowHandle(), grp);
     QByteArray hdrState = grp.readEntry("ColumnState", QByteArray());
     if (!hdrState.isEmpty()) {
         kDebug() << "Restoring column state";
@@ -347,19 +356,16 @@ void EditActionDialog::saveAction()
     }
 }
 
-void EditActionDialog::slotButtonClicked( int button )
+void EditActionDialog::slotAccepted()
 {
-    if ( button == KDialog::Ok ) {
-        saveAction();
-
-        kDebug() << "Saving dialogue state";
-        KConfigGroup grp = KSharedConfig::openConfig()->group("EditActionDialog");
-        saveDialogSize(grp);
-        grp.writeEntry("ColumnState",
-                       m_ui->twCommandList->horizontalHeader()->saveState().toBase64());
-    }
-
-    KDialog::slotButtonClicked( button );
+    saveAction();
+
+    kDebug() << "Saving dialogue state";
+    KConfigGroup grp = KSharedConfig::openConfig()->group("EditActionDialog");
+    KWindowConfig::saveWindowSize(windowHandle(), grp);
+    grp.writeEntry("ColumnState",
+                    m_ui->twCommandList->horizontalHeader()->saveState().toBase64());
+    accept();
 }
 
 void EditActionDialog::onAddCommand()
diff --git a/klipper/editactiondialog.h b/klipper/editactiondialog.h
index be564f836..5023a1950 100644
--- a/klipper/editactiondialog.h
+++ b/klipper/editactiondialog.h
@@ -21,7 +21,7 @@
 #ifndef EDIT_ACTION_DIALOG_H
 #define EDIT_ACTION_DIALOG_H
 
-#include <KDialog>
+#include <QDialog>
 
 namespace Ui
 {
@@ -31,7 +31,7 @@ namespace Ui
 class ClipAction;
 class ActionDetailModel;
 
-class EditActionDialog : public KDialog
+class EditActionDialog : public QDialog
 {
     Q_OBJECT
 public:
@@ -47,6 +47,7 @@ private Q_SLOTS:
     void onAddCommand();
     void onRemoveCommand();
     void onSelectionChanged();
+    void slotAccepted();
 //    void onItemChanged( QTreeWidgetItem*, int );
 
 private:
@@ -62,8 +63,6 @@ private:
      */
     void saveAction();
 
-    virtual void slotButtonClicked( int button );
-
 private:
     Ui::EditActionDialog* m_ui;
 
diff --git a/klipper/klipper.cpp b/klipper/klipper.cpp
index c9ea5a0ea..1ce578afb 100644
--- a/klipper/klipper.cpp
+++ b/klipper/klipper.cpp
@@ -25,6 +25,7 @@
 
 #include <zlib.h>
 
+#include <QDialog>
 #include <QMenu>
 #include <QDBusConnection>
 #include <QSaveFile>
@@ -35,7 +36,6 @@
 #include <KSessionManager>
 #include <KStandardDirs>
 #include <KDebug>
-#include <KDialog>
 #include <KGlobalSettings>
 #include <KActionCollection>
 #include <KToggleAction>
@@ -849,10 +849,13 @@ void Klipper::slotEditData()
 {
     const HistoryStringItem* item = dynamic_cast<const HistoryStringItem*>(m_history->first());
 
-    KDialog dlg;
+    QDialog dlg;
     dlg.setModal( true );
-    dlg.setCaption( i18n("Edit Contents") );
-    dlg.setButtons( KDialog::Ok | KDialog::Cancel );
+    dlg.setWindowTitle( i18n("Edit Contents") );
+    QDialogButtonBox *buttons = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel, &dlg);
+    buttons->button(QDialogButtonBox::Ok)->setShortcut(Qt::CTRL | Qt::Key_Return);
+    connect(buttons, &QDialogButtonBox::accepted, &dlg, &QDialog::accept);
+    connect(buttons, &QDialogButtonBox::rejected, &dlg, &QDialog::reject);
 
     KTextEdit *edit = new KTextEdit( &dlg );
     if (item) {
@@ -860,10 +863,12 @@ void Klipper::slotEditData()
     }
     edit->setFocus();
     edit->setMinimumSize( 300, 40 );
-    dlg.setMainWidget( edit );
+    QVBoxLayout *layout = new QVBoxLayout(&dlg);
+    layout->addWidget(edit);
+    layout->addWidget(buttons);
     dlg.adjustSize();
 
-    if ( dlg.exec() == KDialog::Accepted ) {
+    if ( dlg.exec() == QDialog::Accepted ) {
         QString text = edit->toPlainText();
         if (item) {
             m_history->remove( item );
diff --git a/klipper/urlgrabber.cpp b/klipper/urlgrabber.cpp
index 2cc2e5a01..54085e8a2 100644
--- a/klipper/urlgrabber.cpp
+++ b/klipper/urlgrabber.cpp
@@ -27,7 +27,6 @@
 #include <QX11Info>
 #include <QMenu>
 
-#include <KDialog>
 #include <KLocalizedString>
 #include <KService>
 #include <KDebug>