diff --git a/PKHeX.WinForms/Subforms/PKM Editors/RibbonEditor.cs b/PKHeX.WinForms/Subforms/PKM Editors/RibbonEditor.cs
index b6bcda290..921276e4f 100644
--- a/PKHeX.WinForms/Subforms/PKM Editors/RibbonEditor.cs	
+++ b/PKHeX.WinForms/Subforms/PKM Editors/RibbonEditor.cs	
@@ -42,6 +42,7 @@ private void B_Save_Click(object sender, EventArgs e)
             Close();
         }
 
+        private readonly ToolTip tipName = new ToolTip();
         private void PopulateRibbons()
         {
             // Get a list of all Ribbon Attributes in the PKM
@@ -59,10 +60,9 @@ private void PopulateRibbons()
             
             // Add Ribbons
             foreach (var rib in riblist)
-            {
                 AddRibbonSprite(rib);
+            foreach (var rib in riblist.OrderBy(z => RibbonStrings.GetName(z.Name)))
                 AddRibbonChoice(rib);
-            }
             
             // Force auto-size
             foreach (RowStyle style in TLP_Ribbons.RowStyles)
@@ -79,6 +79,11 @@ private void AddRibbonSprite(RibbonInfo rib)
             if (img == null)
                 return;
 
+            pb.MouseEnter += (s, e) => 
+            {
+                tipName.SetToolTip(pb, RibbonStrings.GetName(rib.Name));
+            };
+
             FLP_Ribbons.Controls.Add(pb);
         }
         private void AddRibbonChoice(RibbonInfo rib)