diff --git a/.gitignore b/.gitignore
index 87b780f22..a4ef46fef 100644
--- a/.gitignore
+++ b/.gitignore
@@ -66,6 +66,7 @@ openminer_server
 # Misc
 *.dat
 *.zip
+saves
 test_atlas.png
 config/client.lua
 config/keys.lua
diff --git a/source/server/world/WorldController.cpp b/source/server/world/WorldController.cpp
index 7ce92710c..e62252577 100644
--- a/source/server/world/WorldController.cpp
+++ b/source/server/world/WorldController.cpp
@@ -24,6 +24,7 @@
  *
  * =====================================================================================
  */
+#include <filesystem>
 #include <fstream>
 
 #include "Registry.hpp"
@@ -49,7 +50,7 @@ void WorldController::update() {
 void WorldController::load(const std::string &name) {
 	gkDebug() << ("Loading '" + name + "'...").c_str();
 
-	std::ifstream file(name + ".dat", std::ofstream::binary);
+	std::ifstream file("saves/" + name + ".dat", std::ofstream::binary);
 
 	if (file.is_open()) {
 		file.seekg(0, file.end);
@@ -101,7 +102,9 @@ void WorldController::load(const std::string &name) {
 void WorldController::save(const std::string &name) {
 	gkDebug() << ("Saving '" + name + "'...").c_str();
 
-	std::ofstream file(name + ".dat", std::ofstream::binary | std::ofstream::trunc);
+	std::filesystem::create_directory("saves");
+
+	std::ofstream file("saves/" + name + ".dat", std::ofstream::binary | std::ofstream::trunc);
 
 	Network::Packet save;
 	for (auto &world : m_worldList) {