diff --git a/scripts/songselect/songwheel.lua b/scripts/songselect/songwheel.lua
index db3caed..56a0af1 100644
--- a/scripts/songselect/songwheel.lua
+++ b/scripts/songselect/songwheel.lua
@@ -433,17 +433,28 @@ function drawData() -- Draws the song data on the left panel
 
         -- Draw grade
         local gradeImage = gradeImages.none;
+        local gradeAlpha = transitionAfterscrollGradeAlpha;
         if bestScore then 
             gradeImage = getGradeImageForScore(bestScore.score)
+
+            if (transitionAfterscrollGradeAlpha == 1 and bestScore.score >= gradeCutoffs.S) then
+                gradeAlpha = transitionFlashAlpha; -- If S, flash the badge
+            end
         end
 
         gfx.BeginPath();
-        gfx.ImageRect(360, 773, 45, 45, gradeImage, transitionAfterscrollGradeAlpha, 0);
+        gfx.ImageRect(360, 773, 45, 45, gradeImage, gradeAlpha, 0);
 
         -- Draw badge
         badgeImage = badgeImages[diff.topBadge+1];
+
+        local badgeAlpha = transitionAfterscrollBadgeAlpha;
+        if (transitionAfterscrollBadgeAlpha == 1 and diff.topBadge >= 3) then
+            badgeAlpha = transitionFlashAlpha; -- If hard clear or above, flash the badge, but only after the initial transition
+        end
+
         gfx.BeginPath()
-        gfx.ImageRect(425, 724, 93/1.1, 81/1.1, badgeImage, transitionAfterscrollBadgeAlpha, 0)
+        gfx.ImageRect(425, 724, 93/1.1, 81/1.1, badgeImage, badgeAlpha, 0)
     end
     gfx.Restore()