diff --git a/src/dialogs/groupdetailsdialog.cpp b/src/dialogs/groupdetailsdialog.cpp
index 5cdd82480..6cbdd9a09 100644
--- a/src/dialogs/groupdetailsdialog.cpp
+++ b/src/dialogs/groupdetailsdialog.cpp
@@ -1,135 +1,173 @@
 /*
     dialogs/groupdetailsdialog.cpp
 
     This file is part of Kleopatra, the KDE keymanager
     SPDX-FileCopyrightText: 2021 g10 Code GmbH
     SPDX-FileContributor: Ingo Klöcker <dev@ingo-kloecker.de>
 
     SPDX-License-Identifier: GPL-2.0-or-later
 */
 
 #include "groupdetailsdialog.h"
 
 #include "commands/detailscommand.h"
+#include "dialogs/editgroupdialog.h"
 #include "view/keytreeview.h"
 
 #include <Libkleo/KeyGroup>
 #include <Libkleo/KeyListModel>
 
 #include <KConfigGroup>
 #include <KGuiItem>
 #include <KLocalizedString>
 #include <KSharedConfig>
 #include <KStandardGuiItem>
 
 #include <QDialogButtonBox>
 #include <QLabel>
 #include <QPushButton>
 #include <QTreeView>
 #include <QVBoxLayout>
 
 #include "kleopatra_debug.h"
 
 using namespace Kleo;
 using namespace Kleo::Commands;
 using namespace Kleo::Dialogs;
 
 Q_DECLARE_METATYPE(GpgME::Key)
 
 class GroupDetailsDialog::Private
 {
     friend class ::Kleo::Dialogs::GroupDetailsDialog;
     GroupDetailsDialog *const q;
 
     struct {
         QLabel *groupNameLabel = nullptr;
         KeyTreeView *treeView = nullptr;
         QDialogButtonBox *buttonBox = nullptr;
+        QPushButton *editButton = nullptr;
     } ui;
     KeyGroup group;
 
 public:
     Private(GroupDetailsDialog *qq)
         : q(qq)
     {
         auto mainLayout = new QVBoxLayout(q);
 
         ui.groupNameLabel = new QLabel();
         ui.groupNameLabel->setWordWrap(true);
         mainLayout->addWidget(ui.groupNameLabel);
 
         ui.treeView = new KeyTreeView(q);
         ui.treeView->view()->setRootIsDecorated(false);
         ui.treeView->view()->setSelectionMode(QAbstractItemView::SingleSelection);
         ui.treeView->setFlatModel(AbstractKeyListModel::createFlatKeyListModel(ui.treeView));
         ui.treeView->setHierarchicalView(false);
         connect(ui.treeView->view(), &QAbstractItemView::doubleClicked,
                 q, [this] (const QModelIndex &index) { showKeyDetails(index); });
         mainLayout->addWidget(ui.treeView);
 
         ui.buttonBox = new QDialogButtonBox(QDialogButtonBox::Close);
         KGuiItem::assign(ui.buttonBox->button(QDialogButtonBox::Close), KStandardGuiItem::close());
-        connect(ui.buttonBox, &QDialogButtonBox::clicked, q, &QDialog::close);
+        ui.editButton = ui.buttonBox->addButton(i18n("Edit"), QDialogButtonBox::ActionRole);
+        ui.editButton->setIcon(QIcon::fromTheme(QStringLiteral("document-edit")));
+        ui.editButton->setEnabled(false);
+        connect(ui.editButton, &QPushButton::clicked, q, [this] () { editGroup(); });
+        connect(ui.buttonBox, &QDialogButtonBox::rejected, q, &QDialog::close);
         mainLayout->addWidget(ui.buttonBox);
 
         // calculate default size with enough space for the key list
         const auto fm = ui.treeView->fontMetrics();
         const QSize sizeHint = q->sizeHint();
         const QSize defaultSize = QSize(qMax(sizeHint.width(), 150 * fm.horizontalAdvance(QLatin1Char('x'))),
                                         sizeHint.height() - ui.treeView->sizeHint().height() + 20 * fm.lineSpacing());
         restoreLayout(defaultSize);
     }
 
     ~Private()
     {
         saveLayout();
     }
 
 private:
     void saveLayout()
     {
         KConfigGroup configGroup(KSharedConfig::openConfig(), "GroupDetailsDialog");
         ui.treeView->saveLayout(configGroup);
         configGroup.writeEntry("Size", q->size());
         configGroup.sync();
     }
 
     void restoreLayout(const QSize &defaultSize)
     {
         const KConfigGroup configGroup(KSharedConfig::openConfig(), "GroupDetailsDialog");
         ui.treeView->restoreLayout(configGroup);
         const QSize size = configGroup.readEntry("Size", defaultSize);
         if (size.isValid()) {
             q->resize(size);
         }
     }
 
     void showKeyDetails(const QModelIndex &index)
     {
         const GpgME::Key key = ui.treeView->view()->model()->data(index, KeyList::KeyRole).value<GpgME::Key>();
         if (!key.isNull()) {
             auto cmd = new DetailsCommand(key, nullptr);
             cmd->setParentWidget(q);
             cmd->start();
         }
     }
+
+    void editGroup()
+    {
+        auto dialog = new EditGroupDialog(q->parentWidget());
+        dialog->setGroup(group);
+        dialog->show();
+        q->reject();
+    }
 };
 
 GroupDetailsDialog::GroupDetailsDialog(QWidget *parent)
     : QDialog(parent)
     , d(new Private(this))
 {
     setWindowTitle(i18nc("@title:window", "Group Details"));
 }
 
 GroupDetailsDialog::~GroupDetailsDialog()
 {
 }
 
+namespace
+{
+QString editButtonToolTip(const KeyGroup &group)
+{
+    switch (group.source()) {
+        case KeyGroup::ApplicationConfig:
+            if (group.isImmutable()) {
+                return i18n("This group is locked down. It cannot be editted by you.");
+            } else {
+                return i18n("Edit this group");
+            }
+        case KeyGroup::GnuPGConfig:
+            return i18n("This group cannot be edited with Kleopatra. It is defined in the configuration files of gpg.");
+        case KeyGroup::Tags:
+            return i18n("This group is implicitly defined by tags assigned to keys. You need to change the tags of keys to add keys to or remove keys from the group.");
+        case KeyGroup::UnknownSource:
+            ;
+    }
+    return i18n("This group cannot be edited with Kleopatra.");
+}
+}
+
 void GroupDetailsDialog::setGroup(const KeyGroup &group)
 {
     d->group = group;
     d->ui.groupNameLabel->setText(group.name());
     const KeyGroup::Keys &keys = group.keys();
     d->ui.treeView->setKeys(std::vector<GpgME::Key>(keys.cbegin(), keys.cend()));
+    d->ui.editButton->setEnabled(!group.isImmutable());
+    d->ui.editButton->setToolTip(editButtonToolTip(group));
 }