diff --git a/src/app/core/controller.cc b/src/app/core/controller.cc
index 3c1a6543..c9066256 100644
--- a/src/app/core/controller.cc
+++ b/src/app/core/controller.cc
@@ -347,7 +347,10 @@ absl::Status Controller::LoadConfigFiles() {
 
   // Create the directory if it doesn't exist
   if (!std::filesystem::exists(config_directory)) {
-    std::filesystem::create_directory(config_directory);
+    if (!std::filesystem::create_directory(config_directory)) {
+      return absl::InternalError(absl::StrFormat(
+          "Failed to create config directory %s", config_directory));
+    }
   }
 
   // Check if the config file exists
@@ -359,6 +362,7 @@ absl::Status Controller::LoadConfigFiles() {
       return absl::InternalError(
           absl::StrFormat("Failed to create config file %s", config_file));
     }
+    file.close();
   }
 
   return absl::OkStatus();
diff --git a/src/app/core/utils/file_util.cc b/src/app/core/utils/file_util.cc
index a803133a..1b332a9a 100644
--- a/src/app/core/utils/file_util.cc
+++ b/src/app/core/utils/file_util.cc
@@ -56,21 +56,19 @@ void SaveFile(const std::string &filename, const std::string &contents,
 std::string GetConfigDirectory(Platform platform) {
   std::string config_directory = ".yaze";
   switch (platform) {
-  case Platform::kMacOS:
-    config_directory = "~/Library/Application Support/yaze";
-    break;
-  case Platform::kWindows:
-    config_directory = "~/AppData/Roaming/yaze";
-    break;
-  case Platform::kLinux:
-    config_directory = "~/.config/yaze";
-    break;
-  default:
-    break;
+    case Platform::kWindows:
+      config_directory = "~/AppData/Roaming/yaze";
+      break;
+    case Platform::kMacOS:
+    case Platform::kLinux:
+      config_directory = "~/.config/yaze";
+      break;
+    default:
+      break;
   }
   return config_directory;
 }
 
-} // namespace core
-} // namespace app
-} // namespace yaze
+}  // namespace core
+}  // namespace app
+}  // namespace yaze