diff --git a/lisp/mail/rmailsum.el b/lisp/mail/rmailsum.el
index 4c502b27870..d15d4a2bf22 100644
--- a/lisp/mail/rmailsum.el
+++ b/lisp/mail/rmailsum.el
@@ -1111,8 +1111,10 @@ If prefix argument REVERSE is non-nil, sort them in reverse order."
 (defun rmail-sort-from-summary (sortfun reverse)
   "Sort Rmail messages from Summary buffer and update it after sorting."
   (require 'rmailsort)
-  (pop-to-buffer rmail-buffer)
-  (funcall sortfun reverse)
-  (rmail-summary))
+  (let ((selwin (selected-window)))
+    (unwind-protect
+	(progn (pop-to-buffer rmail-buffer)
+	       (funcall sortfun reverse))
+      (select-window selwin))))
 
 ;;; rmailsum.el ends here