diff --git a/packages/SystemUI/src/com/android/systemui/bubbles/BubbleController.java b/packages/SystemUI/src/com/android/systemui/bubbles/BubbleController.java
index a23c99e..727d6b6 100644
--- a/packages/SystemUI/src/com/android/systemui/bubbles/BubbleController.java
+++ b/packages/SystemUI/src/com/android/systemui/bubbles/BubbleController.java
@@ -736,6 +736,11 @@
         boolean suppressNotification = entry.getBubbleMetadata() != null
                 && entry.getBubbleMetadata().isNotificationSuppressed()
                 && isForegroundApp(mContext, entry.notification.getPackageName());
+        Bubble b = mBubbleData.getBubbleWithKey(entry.key);
+        if (b != null && mBubbleData.getSelectedBubble() == b && mBubbleData.isExpanded()) {
+            // If we're expanded & selected don't show in shade
+            suppressNotification = true;
+        }
         entry.setShowInShadeWhenBubble(!suppressNotification);
     }