diff --git a/Makefile.am b/Makefile.am
--- a/Makefile.am
+++ b/Makefile.am
@@ -37,6 +37,7 @@
         patches/kleopatra/fix-qt5.6-build.patch \
         patches/kleopatra/0001-Allow-build-with-older-KWindowsystem-versions.patch \
         patches/kleopatra/allow-older-kde-frameworks.patch \
+        patches/kleopatra/fix-restore-geometry.patch \
         patches/kxmlgui/0001-make-qdbus-optional.patch \
         patches/kxmlgui/0003-Make-KTextWidgets-optional.patch \
         patches/kxmlgui/0004-Cruedly-disable-KSendbugmail.patch \
diff --git a/patches/kleopatra/fix-restore-geometry.patch b/patches/kleopatra/fix-restore-geometry.patch
new file mode 100755
--- /dev/null
+++ b/patches/kleopatra/fix-restore-geometry.patch
@@ -0,0 +1,119 @@
+#! /bin/sh
+patch -p1 -l -f $* < $0
+exit $?
+
+diff --git a/src/crypto/gui/decryptverifyfilesdialog.cpp b/src/crypto/gui/decryptverifyfilesdialog.cpp
+index 6698e9b..3e0eb0f 100644
+--- a/src/crypto/gui/decryptverifyfilesdialog.cpp
++++ b/src/crypto/gui/decryptverifyfilesdialog.cpp
+@@ -42,6 +42,8 @@
+
+ #include <Libkleo/FileNameRequester>
+
++#include <QApplication>
++#include <QDesktopWidget>
+ #include <QVBoxLayout>
+ #include <QProgressBar>
+ #include <QLabel>
+@@ -243,18 +245,18 @@ void DecryptVerifyFilesDialog::checkAccept() {
+
+ void DecryptVerifyFilesDialog::readConfig()
+ {
+-    KConfigGroup cfgGroup(KSharedConfig::openConfig(), "DecryptVerifyFilesDialog");
+-    const QByteArray geom = cfgGroup.readEntry("geometry", QByteArray());
+-    if (!geom.isEmpty()) {
+-        restoreGeometry(geom);
+-        return;
++    KConfigGroup dialog(KSharedConfig::openConfig(), "DecryptVerifyFilesDialog");
++    const QSize size = dialog.readEntry("Size", QSize(640, 480));
++    if (size.isValid()) {
++        resize(size);
++    } else {
++        resize(QSize(640, 480));
+     }
+-    resize(QSize(640, 480));
+ }
+
+ void DecryptVerifyFilesDialog::writeConfig()
+ {
+-    KConfigGroup cfgGroup(KSharedConfig::openConfig(), "DecryptVerifyFilesDialog");
+-    cfgGroup.writeEntry("geometry", saveGeometry());
+-    cfgGroup.sync();
++    KConfigGroup dialog(KSharedConfig::openConfig(), "DecryptVerifyFilesDialog");
++    dialog.writeEntry("Size", size());
++    dialog.sync();
+ }
+diff --git a/src/crypto/gui/signencryptfileswizard.cpp b/src/crypto/gui/signencryptfileswizard.cpp
+index 9fd1c52..99f5824 100644
+--- a/src/crypto/gui/signencryptfileswizard.cpp
++++ b/src/crypto/gui/signencryptfileswizard.cpp
+@@ -49,6 +49,9 @@
+ #include <utils/gnupg-helper.h>
+
+ #include <Libkleo/FileNameRequester>
++
++#include <QApplication>
++#include <QDesktopWidget>
+ #include <QVBoxLayout>
+ #include <QWizardPage>
+ #include <QGroupBox>
+@@ -422,12 +425,7 @@ SignEncryptFilesWizard::SignEncryptFilesWizard(QWidget *parent, Qt::WindowFlags
+         mLabel = nullptr;
+     }
+
+-    KConfigGroup cfgGroup(KSharedConfig::openConfig(), "SignEncryptFilesWizard");
+-    const QByteArray geom = cfgGroup.readEntry("geometry", QByteArray());
+-    if (!geom.isEmpty()) {
+-        restoreGeometry(geom);
+-        return;
+-    }
++    readConfig();
+ }
+
+ void SignEncryptFilesWizard::setLabelText(const QString &label) const
+@@ -447,9 +445,7 @@ void SignEncryptFilesWizard::slotCurrentIdChanged(int id)
+ SignEncryptFilesWizard::~SignEncryptFilesWizard()
+ {
+     qCDebug(KLEOPATRA_LOG);
+-    KConfigGroup cfgGroup(KSharedConfig::openConfig(), "SignEncryptFilesWizard");
+-    cfgGroup.writeEntry("geometry", saveGeometry());
+-    cfgGroup.sync();
++    writeConfig();
+ }
+
+ void SignEncryptFilesWizard::setSigningPreset(bool preset)
+@@ -518,4 +514,20 @@ bool SignEncryptFilesWizard::encryptSymmetric() const
+     return mSigEncPage->encryptSymmetric();
+ }
+
++void SignEncryptFilesWizard::readConfig()
++{
++    KConfigGroup dialog(KSharedConfig::openConfig(), "SignEncryptFilesWizard");
++    const QSize size = dialog.readEntry("Size", QSize(640, 480));
++    if (size.isValid()) {
++        resize(size);
++    }
++}
++
++void SignEncryptFilesWizard::writeConfig()
++{
++    KConfigGroup dialog(KSharedConfig::openConfig(), "SignEncryptFilesWizard");
++    dialog.writeEntry("Size", size());
++    dialog.sync();
++}
++
+ #include "signencryptfileswizard.moc"
+diff --git a/src/crypto/gui/signencryptfileswizard.h b/src/crypto/gui/signencryptfileswizard.h
+index ecc7f71..a2e3026 100644
+--- a/src/crypto/gui/signencryptfileswizard.h
++++ b/src/crypto/gui/signencryptfileswizard.h
+@@ -107,6 +107,10 @@ public:
+ Q_SIGNALS:
+     void operationPrepared();
+
++protected:
++    void readConfig();
++    void writeConfig();
++
+ private Q_SLOTS:
+     void slotCurrentIdChanged(int);