diff --git a/clients/aurorae/src/aurorae.cpp b/clients/aurorae/src/aurorae.cpp
index d95cdfe43e..5d377c5dca 100644
--- a/clients/aurorae/src/aurorae.cpp
+++ b/clients/aurorae/src/aurorae.cpp
@@ -363,7 +363,7 @@ KDecorationDefines::Position AuroraeClient::mousePosition(const QPoint &point) c
 {
     // based on the code from deKorator
     int pos = PositionCenter;
-    if (isShade()) {
+    if (isShade() || isMaximized()) {
         return Position(pos);
     }
 
@@ -371,9 +371,8 @@ KDecorationDefines::Position AuroraeClient::mousePosition(const QPoint &point) c
     borders(borderLeft, borderRight, borderTop, borderBottom);
     int paddingLeft, paddingTop, paddingRight, paddingBottom;
     padding(paddingLeft, paddingRight, paddingTop, paddingBottom);
-    const bool maximized = maximizeMode() == MaximizeFull;
     int titleEdgeLeft, titleEdgeRight, titleEdgeTop, titleEdgeBottom;
-    AuroraeFactory::instance()->theme()->titleEdges(titleEdgeLeft, titleEdgeTop, titleEdgeRight, titleEdgeBottom, maximized);
+    AuroraeFactory::instance()->theme()->titleEdges(titleEdgeLeft, titleEdgeTop, titleEdgeRight, titleEdgeBottom, false);
     switch (AuroraeFactory::instance()->theme()->decorationPosition()) {
     case DecorationTop:
         borderTop = titleEdgeTop;
diff --git a/clients/laptop/laptopclient.cpp b/clients/laptop/laptopclient.cpp
index 958cd2ec8c..6462bd7cbe 100644
--- a/clients/laptop/laptopclient.cpp
+++ b/clients/laptop/laptopclient.cpp
@@ -410,13 +410,13 @@ int LaptopClient::layoutMetric(LayoutMetric lm, bool respectWindowState, const K
         case LM_TitleEdgeRight:
         case LM_BorderLeft:
         case LM_BorderRight:
-            return 4;
+            return (maximizeMode() & MaximizeHorizontal) ? 0 : 4;
 
         case LM_BorderBottom:
-            return mustDrawHandle() ? handleSize : 4;
+            return (maximizeMode() & MaximizeVertical) ? 0 : (isResizable() ? handleSize : 4);
 
         case LM_TitleEdgeTop:
-            return 3;
+            return (maximizeMode() & MaximizeVertical) ? 0 : 3;
 
         case LM_TitleEdgeBottom:
             return 1;
diff --git a/effects/zoom/zoom.cpp b/effects/zoom/zoom.cpp
index cc0ff91a53..f84280b537 100644
--- a/effects/zoom/zoom.cpp
+++ b/effects/zoom/zoom.cpp
@@ -407,8 +407,9 @@ void ZoomEffect::zoomIn(double to)
         polling = true;
         effects->startMousePolling();
     }
+    cursorPoint = effects->cursorPos();
     if (mouseTracking == MouseTrackingDisabled)
-        prevPoint = effects->cursorPos();
+        prevPoint = cursorPoint;
     effects->addRepaintFull();
 }