diff --git a/src/Compositor.cpp b/src/Compositor.cpp
index b5851614..afffe7a6 100644
--- a/src/Compositor.cpp
+++ b/src/Compositor.cpp
@@ -121,6 +121,11 @@ CCompositor::CCompositor() {
     m_sWLRToplevelMgr = wlr_foreign_toplevel_manager_v1_create(m_sWLDisplay);
 
     m_sWLRTabletManager = wlr_tablet_v2_create(m_sWLDisplay);
+
+    m_sWLRForeignRegistry = wlr_xdg_foreign_registry_create(m_sWLDisplay);
+
+    wlr_xdg_foreign_v1_create(m_sWLDisplay, m_sWLRForeignRegistry);
+    wlr_xdg_foreign_v2_create(m_sWLDisplay, m_sWLRForeignRegistry);
 }
 
 CCompositor::~CCompositor() {
diff --git a/src/Compositor.hpp b/src/Compositor.hpp
index 16632006..493d3744 100644
--- a/src/Compositor.hpp
+++ b/src/Compositor.hpp
@@ -60,6 +60,7 @@ public:
     wlr_virtual_pointer_manager_v1*  m_sWLRVirtPtrMgr;
     wlr_foreign_toplevel_manager_v1* m_sWLRToplevelMgr;
     wlr_tablet_manager_v2*           m_sWLRTabletManager;
+    wlr_xdg_foreign_registry*        m_sWLRForeignRegistry;
     // ------------------------------------------------- //
 
 
diff --git a/src/includes.hpp b/src/includes.hpp
index 3aca4331..a1fdda70 100644
--- a/src/includes.hpp
+++ b/src/includes.hpp
@@ -88,6 +88,9 @@ extern "C" {
 #include <wlr/types/wlr_pointer_constraints_v1.h>
 #include <wlr/types/wlr_relative_pointer_v1.h>
 #include <wlr/interfaces/wlr_keyboard.h>
+#include <wlr/types/wlr_xdg_foreign_registry.h>
+#include <wlr/types/wlr_xdg_foreign_v1.h>
+#include <wlr/types/wlr_xdg_foreign_v2.h>
 }
 
 #undef class