diff --git a/src/window.cpp b/src/window.cpp
index e9b85f3c5a..a934d5bb84 100644
--- a/src/window.cpp
+++ b/src/window.cpp
@@ -1081,9 +1081,6 @@ void Window::setDesktops(QVector<VirtualDesktop *> desktops)
             }
         }
     }
-    if (info) {
-        info->setDesktop(desktop());
-    }
 
     if (isOnAllDesktops() != wasOnAllDesktops) {
         workspace()->updateOnAllDesktopsOfTransients(this);
diff --git a/src/x11window.cpp b/src/x11window.cpp
index f8ef997bb2..9da64d74d1 100644
--- a/src/x11window.cpp
+++ b/src/x11window.cpp
@@ -1999,6 +1999,7 @@ void X11Window::doSetSkipSwitcher()
 
 void X11Window::doSetDesktop()
 {
+    info->setDesktop(desktop());
     updateVisibility();
 }