diff --git a/app/dockview.cpp b/app/dockview.cpp
index a0e83c90f..a2e569a79 100644
--- a/app/dockview.cpp
+++ b/app/dockview.cpp
@@ -155,10 +155,6 @@ void DockView::init()
 
 bool DockView::setCurrentScreen(const QString id)
 {
-    if (!m_screenToFollow || m_screenToFollow->name() == id) {
-        return false;
-    }
-
     QScreen *nextScreen{qGuiApp->primaryScreen()};
 
     if (id != "primary") {
@@ -170,6 +166,10 @@ bool DockView::setCurrentScreen(const QString id)
         }
     }
 
+    if (m_screenToFollow == nextScreen) {
+        return true;
+    }
+
     if (nextScreen) {
         auto *dockCorona = qobject_cast<DockCorona *>(this->corona());
 
@@ -184,7 +184,7 @@ bool DockView::setCurrentScreen(const QString id)
         }
     }
 
-    return false;
+    return true;
 }
 
 void DockView::setScreenToFollow(QScreen *screen)