diff --git a/src/tabbox/tabboxhandler.cpp b/src/tabbox/tabboxhandler.cpp
index 1e6536e3a6..592f5dc7ec 100644
--- a/src/tabbox/tabboxhandler.cpp
+++ b/src/tabbox/tabboxhandler.cpp
@@ -170,7 +170,8 @@ void TabBoxHandlerPrivate::updateHighlightWindows()
         }
         lastRaisedClient = currentClient;
         // don't elevate desktop
-        if (currentClient && currentClient->internalId() != q->desktopClient().toStrongRef()->internalId()) {
+        const auto desktop = q->desktopClient().toStrongRef();
+        if (currentClient && (!desktop || currentClient->internalId() != desktop->internalId())) {
             q->elevateClient(currentClient, w, true);
         }
     } else {