diff --git a/launcher/Application.cpp b/launcher/Application.cpp
index b1cad5ad4..0f7d85b6b 100644
--- a/launcher/Application.cpp
+++ b/launcher/Application.cpp
@@ -1564,9 +1564,9 @@ void Application::ShowGlobalSettings(class QWidget* parent, QString open_page)
     {
         SettingsObject::Lock lock(APPLICATION->settings());
         PageDialog dlg(m_globalSettingsProvider.get(), open_page, parent);
+        connect(&dlg, &PageDialog::applied, this, &Application::globalSettingsApplied);
         dlg.exec();
     }
-    emit globalSettingsClosed();
 }
 
 MainWindow* Application::showMainWindow(bool minimized)
diff --git a/launcher/Application.h b/launcher/Application.h
index 12f41509c..63432f7e5 100644
--- a/launcher/Application.h
+++ b/launcher/Application.h
@@ -197,7 +197,7 @@ class Application : public QApplication {
    signals:
     void updateAllowedChanged(bool status);
     void globalSettingsAboutToOpen();
-    void globalSettingsClosed();
+    void globalSettingsApplied();
     int currentCatChanged(int index);
 
     void oauthReplyRecieved(QVariantMap);
diff --git a/launcher/ui/InstanceWindow.cpp b/launcher/ui/InstanceWindow.cpp
index bf83a56c9..2f156e125 100644
--- a/launcher/ui/InstanceWindow.cpp
+++ b/launcher/ui/InstanceWindow.cpp
@@ -111,7 +111,7 @@ InstanceWindow::InstanceWindow(InstancePtr instance, QWidget* parent) : QMainWin
         m_container->addButtons(horizontalLayout);
 
         connect(m_instance.get(), &BaseInstance::profilerChanged, this, &InstanceWindow::updateButtons);
-        connect(APPLICATION, &Application::globalSettingsClosed, this, &InstanceWindow::updateButtons);
+        connect(APPLICATION, &Application::globalSettingsApplied, this, &InstanceWindow::updateButtons);
     }
 
     // restore window state
diff --git a/launcher/ui/MainWindow.cpp b/launcher/ui/MainWindow.cpp
index a9473ac15..8b41f838c 100644
--- a/launcher/ui/MainWindow.cpp
+++ b/launcher/ui/MainWindow.cpp
@@ -351,7 +351,7 @@ MainWindow::MainWindow(QWidget* parent) : QMainWindow(parent), ui(new Ui::MainWi
     connect(APPLICATION->instances().get(), &InstanceList::instanceSelectRequest, this, &MainWindow::instanceSelectRequest);
 
     // When the global settings page closes, we want to know about it and update our state
-    connect(APPLICATION, &Application::globalSettingsClosed, this, &MainWindow::globalSettingsClosed);
+    connect(APPLICATION, &Application::globalSettingsApplied, this, &MainWindow::globalSettingsClosed);
 
     m_statusLeft = new QLabel(tr("No instance selected"), this);
     m_statusCenter = new QLabel(tr("Total playtime: 0s"), this);
diff --git a/launcher/ui/pagedialog/PageDialog.cpp b/launcher/ui/pagedialog/PageDialog.cpp
index 275908efa..bfa9ebdb0 100644
--- a/launcher/ui/pagedialog/PageDialog.cpp
+++ b/launcher/ui/pagedialog/PageDialog.cpp
@@ -43,20 +43,26 @@ PageDialog::PageDialog(BasePageProvider* pageProvider, QString defaultId, QWidge
     buttons->setContentsMargins(6, 0, 6, 0);
     m_container->addButtons(buttons);
 
-    connect(buttons->button(QDialogButtonBox::Ok), &QPushButton::clicked, this, &PageDialog::applyAndClose);
+    connect(buttons->button(QDialogButtonBox::Ok), &QPushButton::clicked, this, &PageDialog::accept);
     connect(buttons->button(QDialogButtonBox::Cancel), &QPushButton::clicked, this, &PageDialog::reject);
     connect(buttons->button(QDialogButtonBox::Help), &QPushButton::clicked, m_container, &PageContainer::help);
 
+    connect(this, &QDialog::accepted, this, &PageDialog::onAccepted);
+    connect(this, &QDialog::rejected, this, &PageDialog::storeGeometry);
+
     restoreGeometry(QByteArray::fromBase64(APPLICATION->settings()->get("PagedGeometry").toByteArray()));
 }
-void PageDialog::applyAndClose()
+void PageDialog::onAccepted()
 {
-    qDebug() << "Paged dialog apply and close requested";
+    qDebug() << "Paged dialog accepted";
     if (m_container->prepareToClose()) {
         qDebug() << "Paged dialog close approved";
-        APPLICATION->settings()->set("PagedGeometry", saveGeometry().toBase64());
-        qDebug() << "Paged dialog geometry saved";
-        close();
+        emit applied();
     }
-
+}
+
+void PageDialog::storeGeometry()
+{
+    APPLICATION->settings()->set("PagedGeometry", saveGeometry().toBase64());
+    qDebug() << "Paged dialog geometry saved";
 }
diff --git a/launcher/ui/pagedialog/PageDialog.h b/launcher/ui/pagedialog/PageDialog.h
index 337cfd3a3..d4af862f3 100644
--- a/launcher/ui/pagedialog/PageDialog.h
+++ b/launcher/ui/pagedialog/PageDialog.h
@@ -25,8 +25,14 @@ class PageDialog : public QDialog {
     explicit PageDialog(BasePageProvider* pageProvider, QString defaultId = QString(), QWidget* parent = 0);
     virtual ~PageDialog() {}
 
-   private:
-    void applyAndClose();
+    signals:
+     void applied();
 
+
+   private slots:
+    void onAccepted();
+    void storeGeometry();
+
+   private:
     PageContainer* m_container;
 };
diff --git a/launcher/ui/pages/instance/InstanceSettingsPage.h b/launcher/ui/pages/instance/InstanceSettingsPage.h
index fa1dce3dc..2549c1084 100644
--- a/launcher/ui/pages/instance/InstanceSettingsPage.h
+++ b/launcher/ui/pages/instance/InstanceSettingsPage.h
@@ -48,7 +48,7 @@ class InstanceSettingsPage : public MinecraftSettingsWidget, public BasePage {
     explicit InstanceSettingsPage(MinecraftInstancePtr instance, QWidget* parent = nullptr) : MinecraftSettingsWidget(std::move(instance), parent)
     {
         connect(APPLICATION, &Application::globalSettingsAboutToOpen, this, &InstanceSettingsPage::saveSettings);
-        connect(APPLICATION, &Application::globalSettingsClosed, this, &InstanceSettingsPage::loadSettings);
+        connect(APPLICATION, &Application::globalSettingsApplied, this, &InstanceSettingsPage::loadSettings);
     }
     ~InstanceSettingsPage() override {}
     QString displayName() const override { return tr("Settings"); }