diff --git a/src/managers/XWaylandManager.cpp b/src/managers/XWaylandManager.cpp
index 60b339b3..5c541c0a 100644
--- a/src/managers/XWaylandManager.cpp
+++ b/src/managers/XWaylandManager.cpp
@@ -90,6 +90,9 @@ void CHyprXWaylandManager::getGeometryForWindow(CWindow* pWindow, wlr_box* pbox)
 }
 
 std::string CHyprXWaylandManager::getTitle(CWindow* pWindow) {
+    if (!pWindow->m_bIsMapped)
+        return "";
+
     try {
         if (pWindow->m_bIsX11) {
             if (pWindow->m_uSurface.xwayland && pWindow->m_uSurface.xwayland->title) {
@@ -108,12 +111,12 @@ std::string CHyprXWaylandManager::getTitle(CWindow* pWindow) {
 }
 
 std::string CHyprXWaylandManager::getAppIDClass(CWindow* pWindow) {
+    if (!pWindow->m_bMappedX11 || !pWindow->m_bIsMapped)
+        return "";
+
     try {
         if (pWindow->m_bIsX11) {
             if (pWindow->m_uSurface.xwayland && pWindow->m_uSurface.xwayland->_class) {
-                if (!pWindow->m_bMappedX11 || !pWindow->m_bIsMapped)
-                    return "unmanaged X11";
-
                 return std::string(pWindow->m_uSurface.xwayland->_class);
             }
         } else if (pWindow->m_uSurface.xdg) {