diff --git a/modules/surface/private/linux/system.cpp b/modules/surface/private/linux/system.cpp
index c1ab936..b4f1a39 100644
--- a/modules/surface/private/linux/system.cpp
+++ b/modules/surface/private/linux/system.cpp
@@ -100,6 +100,7 @@ void System::on_surface_construct(entt::registry &registry, entt::entity entity)
 		ensure(display_env != nullptr, "DISPLAY env var not found!");
 
 		auto *display = XOpenDisplay(display_env);
+
 		auto root_window = XDefaultRootWindow(display);
 
 		auto border_width = 0;
@@ -188,6 +189,7 @@ void System::on_surface_destroy(entt::registry &registry, entt::entity entity)
 	}
 
 	XDestroyWindow(display, window);
+	XCloseDisplay(display);
 }
 
 void System::handle_events(SurfaceComponent &surface)
diff --git a/modules/surface/public/system.hpp b/modules/surface/public/system.hpp
index 2280c25..727b119 100644
--- a/modules/surface/public/system.hpp
+++ b/modules/surface/public/system.hpp
@@ -60,7 +60,6 @@ private:
 
 	void set_visibility(ecs::Entity surface_entity, bool visible);
 
-
 	Ref<ecs::Registry> m_registry;
 };