diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/ActivatableNotificationView.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/ActivatableNotificationView.java
index 4f562a5e482fb..94face2581b35 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/ActivatableNotificationView.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/ActivatableNotificationView.java
@@ -1045,6 +1045,10 @@ public abstract class ActivatableNotificationView extends ExpandableOutlineView
         return calculateBgColor(false /* withTint */, false /* withOverride */);
     }
 
+    public int getCurrentBackgroundTint() {
+        return mCurrentBackgroundTint;
+    }
+
     public boolean isPinned() {
         return false;
     }
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/NotificationContentView.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/NotificationContentView.java
index ad745f5ab2763..354ed2d00d32e 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/NotificationContentView.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/NotificationContentView.java
@@ -1444,6 +1444,8 @@ public class NotificationContentView extends FrameLayout {
             smartReplyView.resetSmartSuggestions(smartReplyContainer);
             smartReplyView.addPreInflatedButtons(
                     inflatedSmartReplyView.getSmartSuggestionButtons());
+            // Ensure the colors of the smart suggestion buttons are up-to-date.
+            smartReplyView.setBackgroundTintColor(entry.getRow().getCurrentBackgroundTint());
             smartReplyContainer.setVisibility(View.VISIBLE);
         }
         return smartReplyView;