diff --git a/src/citra_qt/main.cpp b/src/citra_qt/main.cpp
index 8115e5195..e318f7529 100644
--- a/src/citra_qt/main.cpp
+++ b/src/citra_qt/main.cpp
@@ -87,10 +87,9 @@ GMainWindow::GMainWindow()
 
 
     // Restore UI state
-    QSettings layout_settings(QSettings::IniFormat, QSettings::UserScope, "Citra", "layout");
-    restoreGeometry(layout_settings.value("geometry").toByteArray());
-    restoreState(layout_settings.value("state").toByteArray());
-    render_window->restoreGeometry(layout_settings.value("geometryRenderWindow").toByteArray());
+    restoreGeometry(settings.value("UIState/geometry").toByteArray());
+    restoreState(settings.value("UIState/state").toByteArray());
+    render_window->restoreGeometry(settings.value("UIState/geometryRenderWindow").toByteArray());
 
     ui.action_Popout_Window_Mode->setChecked(settings.value("popoutWindowMode", true).toBool());
     ToggleWindowMode();
@@ -229,12 +228,12 @@ void GMainWindow::OnConfigure()
 void GMainWindow::closeEvent(QCloseEvent* event)
 {
     // Save window layout
-    QSettings settings(QSettings::IniFormat, QSettings::UserScope, "Citra", "layout");
-    settings.setValue("geometry", saveGeometry());
-    settings.setValue("state", saveState());
-    settings.setValue("geometryRenderWindow", render_window->saveGeometry());
-    settings.setValue("popoutWindowMode", ui.action_Popout_Window_Mode->isChecked());
-    settings.setValue("firstStart", false);
+    QSettings settings(QSettings::IniFormat, QSettings::UserScope, "Citra", "config");
+    settings.setValue("UIState/geometry", saveGeometry());
+    settings.setValue("UIState/state", saveState());
+    settings.setValue("UIState/geometryRenderWindow", render_window->saveGeometry());
+    settings.setValue("UIState/popoutWindowMode", ui.action_Popout_Window_Mode->isChecked());
+    settings.setValue("UIState/firstStart", false);
     SaveHotkeys(settings);
 
     render_window->close();