diff --git a/src/protocols/Tablet.cpp b/src/protocols/Tablet.cpp
index d7f741b9..7768402b 100644
--- a/src/protocols/Tablet.cpp
+++ b/src/protocols/Tablet.cpp
@@ -2,6 +2,7 @@
 #include "../devices/Tablet.hpp"
 #include "../Compositor.hpp"
 #include "../managers/SeatManager.hpp"
+#include "../managers/eventLoop/EventLoopManager.hpp"
 #include "core/Seat.hpp"
 #include "core/Compositor.hpp"
 #include <algorithm>
@@ -162,11 +163,6 @@ CTabletToolV2Resource::CTabletToolV2Resource(SP<CZwpTabletToolV2> resource_, SP<
     });
 }
 
-CTabletToolV2Resource::~CTabletToolV2Resource() {
-    if (frameSource)
-        wl_event_source_remove(frameSource);
-}
-
 bool CTabletToolV2Resource::good() {
     return resource->resource();
 }
@@ -205,20 +201,22 @@ void CTabletToolV2Resource::sendData() {
 }
 
 void CTabletToolV2Resource::queueFrame() {
-    if (frameSource)
+    if (frameQueued)
         return;
 
-    frameSource = wl_event_loop_add_idle(g_pCompositor->m_sWLEventLoop, [](void* data) { ((CTabletToolV2Resource*)data)->sendFrame(false); }, this);
+    frameQueued = true;
+    g_pEventLoopManager->doLater([this]() {
+        if (!frameQueued || tool.expired() || inert)
+            return;
+
+        sendFrame();
+    });
 }
 
-void CTabletToolV2Resource::sendFrame(bool removeSource) {
-    if (frameSource) {
-        if (removeSource)
-            wl_event_source_remove(frameSource);
-        frameSource = nullptr;
-    }
+void CTabletToolV2Resource::sendFrame() {
+    frameQueued = false;
 
-    if (!current)
+    if (!current || !resource)
         return;
 
     timespec now;
diff --git a/src/protocols/Tablet.hpp b/src/protocols/Tablet.hpp
index 1ebcb1e5..8c99bee0 100644
--- a/src/protocols/Tablet.hpp
+++ b/src/protocols/Tablet.hpp
@@ -112,21 +112,20 @@ class CTabletV2Resource {
 class CTabletToolV2Resource {
   public:
     CTabletToolV2Resource(SP<CZwpTabletToolV2> resource_, SP<CTabletTool> tool_, SP<CTabletSeat> seat_);
-    ~CTabletToolV2Resource();
 
     bool                   good();
     void                   sendData();
     void                   queueFrame();
-    void                   sendFrame(bool removeSource = true);
+    void                   sendFrame();
 
     bool                   current = false;
     WP<CWLSurfaceResource> lastSurf;
 
     WP<CTabletTool>        tool;
     WP<CTabletSeat>        seat;
-    wl_event_source*       frameSource = nullptr;
 
-    bool                   inert = false; // removed was sent
+    bool                   frameQueued = false;
+    bool                   inert       = false; // removed was sent
 
   private:
     SP<CZwpTabletToolV2> resource;
diff --git a/src/protocols/XDGShell.cpp b/src/protocols/XDGShell.cpp
index 688d0006..a542c394 100644
--- a/src/protocols/XDGShell.cpp
+++ b/src/protocols/XDGShell.cpp
@@ -3,6 +3,7 @@
 #include <algorithm>
 #include "../Compositor.hpp"
 #include "../managers/SeatManager.hpp"
+#include "../managers/eventLoop/EventLoopManager.hpp"
 #include "core/Seat.hpp"
 #include "core/Compositor.hpp"
 #include <cstring>
@@ -469,8 +470,6 @@ CXDGSurfaceResource::CXDGSurfaceResource(SP<CXdgSurface> resource_, SP<CXDGWMBas
 
 CXDGSurfaceResource::~CXDGSurfaceResource() {
     events.destroy.emit();
-    if (configureSource)
-        wl_event_source_remove(configureSource);
     if (surface)
         surface->resetRole();
 }
@@ -484,22 +483,23 @@ SP<CXDGSurfaceResource> CXDGSurfaceResource::fromResource(wl_resource* res) {
     return data ? data->self.lock() : nullptr;
 }
 
-static void onConfigure(void* data) {
-    ((CXDGSurfaceResource*)data)->configure();
-}
-
 uint32_t CXDGSurfaceResource::scheduleConfigure() {
-    if (configureSource)
+    if (configureScheduled)
         return scheduledSerial;
 
-    configureSource = wl_event_loop_add_idle(g_pCompositor->m_sWLEventLoop, onConfigure, this);
     scheduledSerial = wl_display_next_serial(g_pCompositor->m_sWLDisplay);
 
+    configureScheduled = true;
+    g_pEventLoopManager->doLater([this]() { configure(); });
+
     return scheduledSerial;
 }
 
 void CXDGSurfaceResource::configure() {
-    configureSource = nullptr;
+    if (!resource)
+        return;
+
+    configureScheduled = false;
     resource->sendConfigure(scheduledSerial);
 }
 
diff --git a/src/protocols/XDGShell.hpp b/src/protocols/XDGShell.hpp
index ef847f3b..3b7d2d11 100644
--- a/src/protocols/XDGShell.hpp
+++ b/src/protocols/XDGShell.hpp
@@ -199,12 +199,12 @@ class CXDGSurfaceResource {
     void configure();
 
   private:
-    SP<CXdgSurface>  resource;
+    SP<CXdgSurface> resource;
 
-    uint32_t         lastConfigureSerial = 0;
-    uint32_t         scheduledSerial     = 0;
+    uint32_t        lastConfigureSerial = 0;
+    uint32_t        scheduledSerial     = 0;
 
-    wl_event_source* configureSource = nullptr;
+    bool            configureScheduled = false;
 
     //
     std::vector<WP<CXDGPopupResource>> popups;
diff --git a/src/xwayland/Server.cpp b/src/xwayland/Server.cpp
index f356af18..390ce1f6 100644
--- a/src/xwayland/Server.cpp
+++ b/src/xwayland/Server.cpp
@@ -176,11 +176,6 @@ static bool openSockets(std::array<int, 2>& sockets, int display) {
     return true;
 }
 
-static void startServer(void* data) {
-    if (!g_pXWayland->pServer->start())
-        Debug::log(ERR, "The XWayland server could not start! XWayland will not work...");
-}
-
 static int xwaylandReady(int fd, uint32_t mask, void* data) {
     return g_pXWayland->pServer->ready(fd, mask);
 }
@@ -308,9 +303,10 @@ bool CXWaylandServer::create() {
 
     setenv("DISPLAY", displayName.c_str(), true);
 
-    // TODO: lazy mode
-
-    idleSource = wl_event_loop_add_idle(g_pCompositor->m_sWLEventLoop, ::startServer, nullptr);
+    g_pEventLoopManager->doLater([this]() {
+        if (!start())
+            Debug::log(ERR, "The XWayland server could not start! XWayland will not work...");
+    });
 
     return true;
 }