diff --git a/which-key-tests.el b/which-key-tests.el
index 81797975184..ae015bec6ef 100644
--- a/which-key-tests.el
+++ b/which-key-tests.el
@@ -170,12 +170,12 @@
       (should
        (equal
         (mapcar 'car (sort (copy-sequence keys) 'which-key-key-order-alpha))
-        '("SPC" "a" "A" "b" "B" "p" "C-a"))))
+        '("SPC" "A" "a" "B" "b" "p" "C-a"))))
     (let (which-key-sort-uppercase-first)
       (should
        (equal
         (mapcar 'car (sort (copy-sequence keys) 'which-key-key-order-alpha))
-        '("SPC" "A" "a" "B" "b" "p" "C-a"))))
+        '("SPC" "a" "A" "b" "B" "p" "C-a"))))
     (let ((which-key-sort-uppercase-first t))
       (should
        (equal
diff --git a/which-key.el b/which-key.el
index d0a28a10589..e5127eefdbe 100644
--- a/which-key.el
+++ b/which-key.el
@@ -1321,11 +1321,11 @@ width) in lines and characters respectively."
     (cond
      ((and alpha (not which-key-sort-uppercase-first))
       (if (string-equal da db)
-          (string-lessp a b)
+          (not (string-lessp a b))
         (string-lessp da db)))
      ((and alpha which-key-sort-uppercase-first)
       (if (string-equal da db)
-          (not (string-lessp a b))
+          (string-lessp a b)
         (string-lessp da db)))
      ((not which-key-sort-uppercase-first)
       (let ((aup (not (string-equal da a)))