diff --git a/launcher/ui/pagedialog/PageDialog.cpp b/launcher/ui/pagedialog/PageDialog.cpp
index aad204979..6292beec3 100644
--- a/launcher/ui/pagedialog/PageDialog.cpp
+++ b/launcher/ui/pagedialog/PageDialog.cpp
@@ -56,13 +56,26 @@ PageDialog::PageDialog(BasePageProvider* pageProvider, QString defaultId, QWidge
     restoreGeometry(QByteArray::fromBase64(APPLICATION->settings()->get("PagedGeometry").toByteArray()));
 }
 
-void PageDialog::closeEvent([[maybe_unused]] QCloseEvent* event)
+void PageDialog::accept()
+{
+    if (handleClose())
+        QDialog::accept();
+}
+
+void PageDialog::closeEvent(QCloseEvent* event)
+{
+    if (handleClose())
+        QDialog::closeEvent(event);
+}
+
+bool PageDialog::handleClose() const
 {
     qDebug() << "Paged dialog close requested";
-    if (m_container->prepareToClose()) {
-        qDebug() << "Paged dialog close approved";
-        APPLICATION->settings()->set("PagedGeometry", saveGeometry().toBase64());
-        qDebug() << "Paged dialog geometry saved";
-        QDialog::closeEvent(event);
-    }
+    if (!m_container->prepareToClose())
+        return false;
+
+    qDebug() << "Paged dialog close approved";
+    APPLICATION->settings()->set("PagedGeometry", saveGeometry().toBase64());
+    qDebug() << "Paged dialog geometry saved";
+    return true;
 }
diff --git a/launcher/ui/pagedialog/PageDialog.h b/launcher/ui/pagedialog/PageDialog.h
index cc250af75..f3b914923 100644
--- a/launcher/ui/pagedialog/PageDialog.h
+++ b/launcher/ui/pagedialog/PageDialog.h
@@ -29,7 +29,9 @@ class PageDialog : public QDialog {
     void applied();
 
    private:
+    void accept() override;
     void closeEvent(QCloseEvent* event) override;
+    bool handleClose() const;
 
    private:
     PageContainer* m_container;