diff --git a/packages/SystemUI/src/com/android/systemui/volume/VolumeUI.java b/packages/SystemUI/src/com/android/systemui/volume/VolumeUI.java
index e38c2ac8de514..6d6fd60ec1893 100644
--- a/packages/SystemUI/src/com/android/systemui/volume/VolumeUI.java
+++ b/packages/SystemUI/src/com/android/systemui/volume/VolumeUI.java
@@ -132,6 +132,9 @@ public class VolumeUI extends SystemUI {
                     final Intent intent = ZenModePanel.ZEN_SETTINGS;
                     intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TOP);
                     mContext.startActivityAsUser(intent, new UserHandle(UserHandle.USER_CURRENT));
+
+                    // dismiss shade if showing
+                    mContext.sendBroadcast(new Intent(Intent.ACTION_CLOSE_SYSTEM_DIALOGS));
                 }
             });
             mDialogPanel.postDismiss(mDismissDelay);