diff --git a/app/view/positioner.cpp b/app/view/positioner.cpp
index 44392215e..b9c42df0e 100644
--- a/app/view/positioner.cpp
+++ b/app/view/positioner.cpp
@@ -144,6 +144,10 @@ void Positioner::init()
         }
     });
 
+    connect(this, &Positioner::slideOffsetChanged, this, [&]() {
+        updatePosition(m_lastAvailableScreenRect);
+    });
+
     connect(m_view, &QQuickWindow::xChanged, this, &Positioner::validateDockGeometry);
     connect(m_view, &QQuickWindow::yChanged, this, &Positioner::validateDockGeometry);
     connect(m_view, &QQuickWindow::widthChanged, this, &Positioner::validateDockGeometry);
@@ -749,9 +753,9 @@ void Positioner::updatePosition(QRect availableScreenRect)
                    << m_view->location();
     }
 
-    if (m_slideOffset == 0) {
+    if (m_slideOffset == 0 || m_goToLocation != Plasma::Types::Floating /*exactly after relocating and changing screen edge*/) {
         //! update valid geometry in normal positioning
-        m_validGeometry.setTopLeft(position);
+        m_validGeometry.moveTopLeft(position);
     } else {
         //! when sliding in/out update only the relevant axis for the screen_edge in
         //! to not mess the calculations and the automatic geometry checkers that
@@ -782,33 +786,6 @@ void Positioner::setSlideOffset(int offset)
     }
 
     m_slideOffset = offset;
-
-    QPoint slidedTopLeft;
-
-    if (m_view->location() == Plasma::Types::TopEdge) {
-        int boundedY = qMax(m_view->screenGeometry().top() - (m_validGeometry.height() + 1), m_validGeometry.y() - qAbs(m_slideOffset));
-        slidedTopLeft = {m_validGeometry.x(), boundedY};
-
-    } else if (m_view->location() == Plasma::Types::BottomEdge) {
-        int boundedY = qMin(m_view->screenGeometry().bottom() - 1, m_validGeometry.y() + qAbs(m_slideOffset));
-        slidedTopLeft = {m_validGeometry.x(), boundedY};
-
-    } else if (m_view->location() == Plasma::Types::RightEdge) {
-        int boundedX = qMin(m_view->screenGeometry().right() - 1, m_validGeometry.x() + qAbs(m_slideOffset));
-        slidedTopLeft = {boundedX, m_validGeometry.y()};
-
-    } else if (m_view->location() == Plasma::Types::LeftEdge) {
-        int boundedX = qMax(m_view->screenGeometry().left() - (m_validGeometry.width() + 1), m_validGeometry.x() - qAbs(m_slideOffset));
-        slidedTopLeft = {boundedX, m_validGeometry.y()};
-
-    }
-
-    m_view->setPosition(slidedTopLeft);
-
-    if (m_view->surface()) {
-        m_view->surface()->setPosition(slidedTopLeft);
-    }
-
     emit slideOffsetChanged();
 }
 
@@ -870,6 +847,8 @@ void Positioner::initSignalingForLocationChangeSliding()
 
     connect(m_view, &View::locationChanged, this, [&]() {
         if (m_goToLocation != Plasma::Types::Floating) {
+            immediateSyncGeometry();
+
             m_goToLocation = Plasma::Types::Floating;
 
             QTimer::singleShot(100, [this]() {
diff --git a/shell/package/contents/configuration/pages/BehaviorConfig.qml b/shell/package/contents/configuration/pages/BehaviorConfig.qml
index b5d802397..ede16eb1b 100644
--- a/shell/package/contents/configuration/pages/BehaviorConfig.qml
+++ b/shell/package/contents/configuration/pages/BehaviorConfig.qml
@@ -214,7 +214,7 @@ PlasmaComponents.Page {
                     Layout.maximumWidth: Layout.minimumWidth
                     text: i18nc("bottom location", "Bottom")
                     iconSource: "arrow-down"
-                    checked: latteView.location === edge
+                    checked: plasmoid.location === edge
                     checkable: true
                     exclusiveGroup: locationGroup
 
@@ -226,7 +226,7 @@ PlasmaComponents.Page {
                     Layout.maximumWidth: Layout.minimumWidth
                     text: i18nc("left location", "Left")
                     iconSource: "arrow-left"
-                    checked: latteView.location === edge
+                    checked: plasmoid.location === edge
                     checkable: true
                     exclusiveGroup: locationGroup
 
@@ -238,7 +238,7 @@ PlasmaComponents.Page {
                     Layout.maximumWidth: Layout.minimumWidth
                     text: i18nc("top location", "Top")
                     iconSource: "arrow-up"
-                    checked: latteView.location === edge
+                    checked: plasmoid.location === edge
                     checkable: true
                     exclusiveGroup: locationGroup
 
@@ -250,7 +250,7 @@ PlasmaComponents.Page {
                     Layout.maximumWidth: Layout.minimumWidth
                     text: i18nc("right location", "Right")
                     iconSource: "arrow-right"
-                    checked: latteView.location === edge
+                    checked: plasmoid.location === edge
                     checkable: true
                     exclusiveGroup: locationGroup