diff --git a/geometry.cpp b/geometry.cpp
index 8e7e59d156..0fdf1f0714 100644
--- a/geometry.cpp
+++ b/geometry.cpp
@@ -2632,8 +2632,6 @@ void Client::finishMoveResize(bool cancel)
     if (isElectricBorderMaximizing()) {
         setQuickTileMode(electricMode);
         electricMaximizing = false;
-        outline()->hide();
-        elevate(false);
     } else if (!cancel) {
         if (!(maximizeMode() & MaximizeHorizontal)) {
             geom_restore.setX(geometry().x());
@@ -2678,6 +2676,10 @@ void Client::leaveMoveResize()
     if (ScreenEdges::self()->isDesktopSwitchingMovingClients())
         ScreenEdges::self()->reserveDesktopSwitching(false, Qt::Vertical|Qt::Horizontal);
 #endif
+    if (isElectricBorderMaximizing()) {
+        outline()->hide();
+        elevate(false);
+    }
 }
 
 // This function checks if it actually makes sense to perform a restricted move/resize.