diff --git a/src/yuzu/configuration/configure_per_game.cpp b/src/yuzu/configuration/configure_per_game.cpp
index a7b7698f29..007d93c779 100644
--- a/src/yuzu/configuration/configure_per_game.cpp
+++ b/src/yuzu/configuration/configure_per_game.cpp
@@ -30,13 +30,9 @@
 
 ConfigurePerGame::ConfigurePerGame(QWidget* parent, u64 title_id, std::string_view file_name)
     : QDialog(parent), ui(std::make_unique<Ui::ConfigurePerGame>()), title_id(title_id) {
-    if (title_id == 0) {
-        game_config = std::make_unique<Config>(Common::FS::GetFilename(file_name),
-                                               Config::ConfigType::PerGameConfig);
-    } else {
-        game_config = std::make_unique<Config>(fmt::format("{:016X}", title_id),
-                                               Config::ConfigType::PerGameConfig);
-    }
+    const auto config_file_name =
+        title_id == 0 ? Common::FS::GetFilename(file_name) : fmt::format("{:016X}", title_id);
+    game_config = std::make_unique<Config>(config_file_name, Config::ConfigType::PerGameConfig);
 
     Settings::SetConfiguringGlobal(false);
 
diff --git a/src/yuzu/main.cpp b/src/yuzu/main.cpp
index 8f04575f17..1d63ababb1 100644
--- a/src/yuzu/main.cpp
+++ b/src/yuzu/main.cpp
@@ -1334,13 +1334,10 @@ void GMainWindow::BootGame(const QString& filename, std::size_t program_index) {
 
     if (!(loader == nullptr || loader->ReadProgramId(title_id) != Loader::ResultStatus::Success)) {
         // Load per game settings
-        if (title_id == 0) {
-            Config per_game_config(Common::FS::GetFilename(filename.toStdString()),
-                                   Config::ConfigType::PerGameConfig);
-        } else {
-            Config per_game_config(fmt::format("{:016X}", title_id),
-                                   Config::ConfigType::PerGameConfig);
-        }
+        const auto config_file_name = title_id == 0
+                                          ? Common::FS::GetFilename(filename.toStdString())
+                                          : fmt::format("{:016X}", title_id);
+        Config per_game_config(config_file_name, Config::ConfigType::PerGameConfig);
     }
 
     ConfigureVibration::SetAllVibrationDevices();
@@ -1850,15 +1847,11 @@ void GMainWindow::RemoveTransferableShaderCache(u64 program_id) {
 }
 
 void GMainWindow::RemoveCustomConfiguration(u64 program_id, std::string_view game_path) {
-    std::string custom_config_file_path;
-    if (program_id == 0) {
-        custom_config_file_path = Common::FS::GetYuzuPath(Common::FS::YuzuPath::ConfigDir) /
-                                  "custom" /
-                                  fmt::format("{:s}.ini", Common::FS::GetFilename(game_path));
-    } else {
-        custom_config_file_path = Common::FS::GetYuzuPath(Common::FS::YuzuPath::ConfigDir) /
-                                  "custom" / fmt::format("{:016X}.ini", program_id);
-    }
+    const auto config_file_name = program_id == 0
+                                      ? fmt::format("{:s}.ini", Common::FS::GetFilename(game_path))
+                                      : fmt::format("{:016X}.ini", program_id);
+    const auto custom_config_file_path =
+        Common::FS::GetYuzuPath(Common::FS::YuzuPath::ConfigDir) / "custom" / config_file_name;
 
     if (!Common::FS::Exists(custom_config_file_path)) {
         QMessageBox::warning(this, tr("Error Removing Custom Configuration"),