diff --git a/tabbox/tabboxhandler.cpp b/tabbox/tabboxhandler.cpp
index b6bd8bde9f..85fccfd364 100644
--- a/tabbox/tabboxhandler.cpp
+++ b/tabbox/tabboxhandler.cpp
@@ -722,6 +722,10 @@ void TabBoxHandler::createModel( bool partialReset )
         {
         case TabBoxConfig::ClientTabBox:
             d->clientModel()->createClientList( partialReset );
+            if (d->lastRaisedClient && !stackingOrder().contains(d->lastRaisedClient))
+                d->lastRaisedClient = 0;
+            if (d->lastRaisedClientSucc && !stackingOrder().contains(d->lastRaisedClientSucc))
+                d->lastRaisedClientSucc = 0;
             break;
         case TabBoxConfig::DesktopTabBox:
             d->desktopModel()->createDesktopList();