diff --git a/app/dockview.cpp b/app/dockview.cpp
index 04b1bc8ef..fde92ae4a 100644
--- a/app/dockview.cpp
+++ b/app/dockview.cpp
@@ -235,7 +235,8 @@ void DockView::init()
 
 void DockView::initSignalingForLocationChangeSliding()
 {
-    connect(this, &DockView::hideDockDuringLocationChangeSignal, this, [&]() {
+    //! signals to handle the sliding-in/out during location changes
+    connect(this, &DockView::hideDockDuringLocationChangeStarted, this, [&]() {
         setBlockHiding(false);
 
         if (m_configView) {
@@ -256,7 +257,7 @@ void DockView::initSignalingForLocationChangeSliding()
         if (blockAnimations()) {
             QTimer::singleShot(100, [this]() {
                 setBlockAnimations(false);
-                emit showDockAfterLocationChangeSignal();
+                emit showDockAfterLocationChangeFinished();
                 showSettingsWindow();
             });
         }
@@ -1233,7 +1234,7 @@ void DockView::setShadow(int shadow)
 void DockView::hideDockDuringLocationChange(int goToLocation)
 {
     m_goToLocation = static_cast<Plasma::Types::Location>(goToLocation);
-    emit hideDockDuringLocationChangeSignal();
+    emit hideDockDuringLocationChangeStarted();
 }
 
 
diff --git a/app/dockview.h b/app/dockview.h
index 11b8cfc08..0cf404dc2 100644
--- a/app/dockview.h
+++ b/app/dockview.h
@@ -217,9 +217,12 @@ signals:
     //! these two signals are used from config ui and containment ui
     //! in order to orchestrate an animated hiding/showing of dock
     //! during changing location
-    void hideDockDuringLocationChangeSignal();
+    void hideDockDuringLocationChangeStarted();
     void hideDockDuringLocationChangeFinished();
-    void showDockAfterLocationChangeSignal();
+    void hideDockDuringScreenChangeStarted();
+    void hideDockDuringScreenChangeFinished();
+    void showDockAfterLocationChangeFinished();
+    void showDockAfterScreenChangeFinished();
 
     void alternativesIsShownChanged();
     void alignmentChanged();
diff --git a/containment/package/contents/ui/main.qml b/containment/package/contents/ui/main.qml
index 13696720f..e8e98ad54 100644
--- a/containment/package/contents/ui/main.qml
+++ b/containment/package/contents/ui/main.qml
@@ -397,8 +397,8 @@ DragDrop.DropArea {
             dock.onWidthChanged.connect(visibilityManager.updateMaskArea);
             dock.onHeightChanged.connect(visibilityManager.updateMaskArea);
 
-            dock.hideDockDuringLocationChangeSignal.connect(visibilityManager.slotHideDockDuringLocationChange);
-            dock.showDockAfterLocationChangeSignal.connect(visibilityManager.slotShowDockAfterLocationChange);
+            dock.hideDockDuringLocationChangeStarted.connect(visibilityManager.slotHideDockDuringLocationChange);
+            dock.showDockAfterLocationChangeFinished.connect(visibilityManager.slotShowDockAfterLocationChange);
 
             dock.visibility.onContainsMouseChanged.connect(visibilityManager.slotContainsMouseChanged);
             dock.visibility.onMustBeHide.connect(visibilityManager.slotMustBeHide);
@@ -566,8 +566,8 @@ DragDrop.DropArea {
             dock.onYChanged.disconnect(visibilityManager.updateMaskArea);
             dock.onWidthChanged.disconnect(visibilityManager.updateMaskArea);
             dock.onHeightChanged.disconnect(visibilityManager.updateMaskArea);
-            dock.hideDockDuringLocationChangeSignal.disconnect(visibilityManager.slotHideDockDuringLocationChange);
-            dock.showDockAfterLocationChangeSignal.disconnect(visibilityManager.slotShowDockAfterLocationChange);
+            dock.hideDockDuringLocationChangeStarted.disconnect(visibilityManager.slotHideDockDuringLocationChange);
+            dock.showDockAfterLocationChangeFinished.disconnect(visibilityManager.slotShowDockAfterLocationChange);
 
             if (dock.visibility) {
                 dock.visibility.onContainsMouseChanged.disconnect(visibilityManager.slotContainsMouseChanged);