1 files changed, 3 insertions, 2 deletions

diff --git a/lisp/uniquify.el b/lisp/uniquify.el
index 20291d55b82..2f02236122f 100644
--- a/lisp/uniquify.el
+++ b/lisp/uniquify.el
@@ -223,8 +223,9 @@ file name elements.  Arguments cause only a subset of buffers to be renamed."
         (setq buffers (cdr buffers))))
     ;; selects buffers whose names may need changing, and others that
     ;; may conflict.
-    (setq fix-list
-          (sort fix-list 'uniquify-fix-item-filename-lessp))
+    (setq fix-list (sort
+                    (sort fix-list 'string-lessp) ;do a quick pre-ordering
+                    'uniquify-fix-item-filename-lessp))
     ;; bringing conflicting names together
     (uniquify-rationalize-a-list fix-list uniquify-min-dir-content)
     (mapcar 'uniquify-fix-item-unrationalized-buffer fix-list)))