diff --git a/src/wmmgr.cc b/src/wmmgr.cc
index fbc6048c1..24b1ffc71 100644
--- a/src/wmmgr.cc
+++ b/src/wmmgr.cc
@@ -3590,7 +3590,7 @@ void YWindowManager::undoArrange() {
         delete [] fArrangeInfo; fArrangeInfo = nullptr;
         fArrangeCount = 0;
         unlockFocus();
-        focusLastWindow();
+        focusTopWindow();
     }
     setShowingDesktop(false);
 }