diff --git a/src/common/path_util.cpp b/src/common/path_util.cpp
index 60ed8892f..e75665600 100644
--- a/src/common/path_util.cpp
+++ b/src/common/path_util.cpp
@@ -107,16 +107,7 @@ static auto UserPaths = [] {
     };
 
     create_path(PathType::UserDir, user_dir);
-
-#ifdef _WIN32
-    auto config_path = std::filesystem::path(getenv("APPDATA")) / "shadPS4";
-#elif __APPLE__
-    auto config_path = user_dir;
-#else
-    auto config_path = std::filesystem::current_path();
-#endif
-    create_path(PathType::ConfigDir, config_path);
-
+    create_path(PathType::ConfigDir, std::filesystem::current_path());
     create_path(PathType::LogDir, user_dir / LOG_DIR);
     create_path(PathType::ScreenshotsDir, user_dir / SCREENSHOTS_DIR);
     create_path(PathType::ShaderDir, user_dir / SHADER_DIR);
diff --git a/src/qt_gui/main_window.cpp b/src/qt_gui/main_window.cpp
index b58e7740d..c7ec9d139 100644
--- a/src/qt_gui/main_window.cpp
+++ b/src/qt_gui/main_window.cpp
@@ -28,7 +28,6 @@ MainWindow::MainWindow(QWidget* parent) : QMainWindow(parent), ui(new Ui::MainWi
 
 MainWindow::~MainWindow() {
     SaveWindowState();
-    Common::FS::SetUserPath(Common::FS::PathType::UserDir, Config::getEmulatorUserDir());
     const auto config_dir = Common::FS::GetUserPath(Common::FS::PathType::ConfigDir);
     Config::save(config_dir / "config.toml");
 }