diff --git a/src/citron/configuration/configure_per_game.cpp b/src/citron/configuration/configure_per_game.cpp
index 347ab476d..3f52bdaf6 100644
--- a/src/citron/configuration/configure_per_game.cpp
+++ b/src/citron/configuration/configure_per_game.cpp
@@ -38,6 +38,7 @@
 #include "core/loader/loader.h"
 #include "frontend_common/config.h"
 #include "ui_configure_per_game.h"
+#include "citron/uisettings.h"
 #include "citron/configuration/configuration_shared.h"
 #include "citron/configuration/configure_audio.h"
 #include "citron/configuration/configure_cpu.h"
@@ -78,6 +79,10 @@ rainbow_timer{new QTimer(this)} {
 
     ui->setupUi(this);
 
+    if (!UISettings::values.per_game_configure_geometry.isEmpty()) {
+        restoreGeometry(UISettings::values.per_game_configure_geometry);
+    }
+
     ApplyStaticTheme();
     UpdateTheme(); // Run once to set initial colors
     connect(rainbow_timer, &QTimer::timeout, this, &ConfigurePerGame::UpdateTheme);
@@ -131,7 +136,9 @@ rainbow_timer{new QTimer(this)} {
     LoadConfiguration();
 }
 
-ConfigurePerGame::~ConfigurePerGame() = default;
+ConfigurePerGame::~ConfigurePerGame() {
+    UISettings::values.per_game_configure_geometry = saveGeometry();
+}
 
 void ConfigurePerGame::accept() {
     ApplyConfiguration();