diff --git a/src/dialogs/lookupcertificatesdialog.cpp b/src/dialogs/lookupcertificatesdialog.cpp
index 696202206..cf42a6e3b 100644
--- a/src/dialogs/lookupcertificatesdialog.cpp
+++ b/src/dialogs/lookupcertificatesdialog.cpp
@@ -1,236 +1,244 @@
 /* -*- mode: c++; c-basic-offset:4 -*-
     dialogs/lookupcertificatesdialog.cpp
 
     This file is part of Kleopatra, the KDE keymanager
     SPDX-FileCopyrightText: 2008 Klarälvdalens Datakonsult AB
 
     SPDX-License-Identifier: GPL-2.0-or-later
 */
 
 #include <config-kleopatra.h>
 
 #include "lookupcertificatesdialog.h"
 
 #include "ui_lookupcertificatesdialog.h"
 
 #include <Libkleo/KeyListModel>
 #include <KConfigGroup>
 #include <gpgme++/key.h>
 
 #include <KLocalizedString>
 
 #include <QPushButton>
 #include <QTreeView>
 
 #include <KSharedConfig>
 
 using namespace Kleo;
 using namespace Kleo::Dialogs;
 using namespace GpgME;
 
 static const int minimalSearchTextLength = 2;
 
 class LookupCertificatesDialog::Private
 {
     friend class ::Kleo::Dialogs::LookupCertificatesDialog;
     LookupCertificatesDialog *const q;
 public:
     explicit Private(LookupCertificatesDialog *qq);
     ~Private();
 
 private:
     void slotSelectionChanged()
     {
         enableDisableWidgets();
     }
     void slotSearchTextChanged()
     {
         enableDisableWidgets();
     }
     void slotSearchClicked()
     {
         Q_EMIT q->searchTextChanged(ui.findED->text());
     }
     void slotDetailsClicked()
     {
         Q_ASSERT(q->selectedCertificates().size() == 1);
         Q_EMIT q->detailsRequested(q->selectedCertificates().front());
     }
     void slotSaveAsClicked()
     {
         Q_EMIT q->saveAsRequested(q->selectedCertificates());
     }
 
     void readConfig();
     void writeConfig();
     void enableDisableWidgets();
 
     QString searchText() const
     {
         return ui.findED->text().trimmed();
     }
 
     std::vector<Key> selectedCertificates() const
     {
         const QAbstractItemView *const view = ui.resultTV->view();
         if (!view) {
             return std::vector<Key>();
         }
         const auto *const model = dynamic_cast<KeyListModelInterface*>(view->model());
         Q_ASSERT(model);
         const QItemSelectionModel *const sm = view->selectionModel();
         Q_ASSERT(sm);
         return model->keys(sm->selectedRows());
     }
 
     int numSelectedCertificates() const
     {
         return ui.resultTV->selectedKeys().size();
     }
 private:
     bool passive;
 
     struct Ui : Ui_LookupCertificatesDialog {
 
         explicit Ui(LookupCertificatesDialog *q)
             : Ui_LookupCertificatesDialog()
         {
             setupUi(q);
 
             saveAsPB->hide(); // ### not yet implemented in LookupCertificatesCommand
 
             findED->setClearButtonEnabled(true);
 
             resultTV->setFlatModel(AbstractKeyListModel::createFlatKeyListModel(q));
             resultTV->setHierarchicalView(false);
 
             importPB()->setText(i18n("Import"));
             importPB()->setEnabled(false);
 
             connect(resultTV->view(), SIGNAL(doubleClicked(QModelIndex)),
                     importPB(), SLOT(animateClick()));
 
             findED->setFocus();
 
             connect(selectAllPB, &QPushButton::clicked,
                     resultTV->view(), &QTreeView::selectAll);
             connect(deselectAllPB, &QPushButton::clicked,
                     resultTV->view(), &QTreeView::clearSelection);
         }
 
         QPushButton *importPB() const
         {
             return buttonBox->button(QDialogButtonBox::Save);
         }
         QPushButton *closePB()  const
         {
             return buttonBox->button(QDialogButtonBox::Close);
         }
     } ui;
 };
 
 LookupCertificatesDialog::Private::Private(LookupCertificatesDialog *qq)
     : q(qq),
       passive(false),
       ui(q)
 {
     connect(ui.resultTV->view()->selectionModel(), SIGNAL(selectionChanged(QItemSelection,QItemSelection)),
             q, SLOT(slotSelectionChanged()));
 }
 
 LookupCertificatesDialog::Private::~Private() {}
 
 void LookupCertificatesDialog::Private::readConfig()
 {
-    KConfigGroup dialog(KSharedConfig::openConfig(), "LookupCertificatesDialog");
-    const QSize size = dialog.readEntry("Size", QSize(600, 400));
+    KConfigGroup configGroup(KSharedConfig::openConfig(), "LookupCertificatesDialog");
+
+    KConfigGroup resultKeysConfig = configGroup.group("ResultKeysView");
+    ui.resultTV->restoreLayout(resultKeysConfig);
+
+    const QSize size = configGroup.readEntry("Size", QSize(600, 400));
     if (size.isValid()) {
         q->resize(size);
     }
 }
 
 void LookupCertificatesDialog::Private::writeConfig()
 {
-    KConfigGroup dialog(KSharedConfig::openConfig(), "LookupCertificatesDialog");
-    dialog.writeEntry("Size", q->size());
-    dialog.sync();
+    KConfigGroup configGroup(KSharedConfig::openConfig(), "LookupCertificatesDialog");
+    configGroup.writeEntry("Size", q->size());
+
+    KConfigGroup resultKeysConfig = configGroup.group("ResultKeysView");
+    ui.resultTV->saveLayout(resultKeysConfig);
+
+    configGroup.sync();
 }
 
 LookupCertificatesDialog::LookupCertificatesDialog(QWidget *p, Qt::WindowFlags f)
     : QDialog(p, f), d(new Private(this))
 {
     d->ui.findPB->setEnabled(false);
     d->readConfig();
 }
 
 LookupCertificatesDialog::~LookupCertificatesDialog()
 {
     d->writeConfig();
 }
 
 void LookupCertificatesDialog::setCertificates(const std::vector<Key> &certs)
 {
     d->ui.resultTV->view()->setFocus();
     d->ui.resultTV->setKeys(certs);
 }
 
 std::vector<Key> LookupCertificatesDialog::selectedCertificates() const
 {
     return d->selectedCertificates();
 }
 
 void LookupCertificatesDialog::setPassive(bool on)
 {
     if (d->passive == on) {
         return;
     }
     d->passive = on;
     d->enableDisableWidgets();
 }
 
 bool LookupCertificatesDialog::isPassive() const
 {
     return d->passive;
 }
 
 void LookupCertificatesDialog::setSearchText(const QString &text)
 {
     d->ui.findED->setText(text);
 }
 
 QString LookupCertificatesDialog::searchText() const
 {
     return d->ui.findED->text();
 }
 
 void LookupCertificatesDialog::accept()
 {
     Q_ASSERT(!selectedCertificates().empty());
     Q_EMIT importRequested(selectedCertificates());
     QDialog::accept();
 }
 
 void LookupCertificatesDialog::Private::enableDisableWidgets()
 {
     // enable/disable everything except 'close', based on passive:
     Q_FOREACH (QObject *const o, q->children())
         if (QWidget *const w = qobject_cast<QWidget *>(o)) {
             w->setDisabled(passive && w != ui.closePB() && w != ui.buttonBox);
         }
 
     if (passive) {
         return;
     }
 
     ui.findPB->setEnabled(searchText().length() > minimalSearchTextLength);
 
     const int n = q->selectedCertificates().size();
 
     ui.detailsPB->setEnabled(n == 1);
     ui.saveAsPB->setEnabled(n == 1);
     ui.importPB()->setEnabled(n != 0);
     ui.importPB()->setDefault(false);   // otherwise Import becomes default button if enabled and return triggers both a search and accept()
 }
 
 #include "moc_lookupcertificatesdialog.cpp"