diff --git a/src/com/android/settings/notification/ZenModeAutomationSettings.java b/src/com/android/settings/notification/ZenModeAutomationSettings.java
index d38c5803773..3cf28e1c74a 100644
--- a/src/com/android/settings/notification/ZenModeAutomationSettings.java
+++ b/src/com/android/settings/notification/ZenModeAutomationSettings.java
@@ -311,6 +311,7 @@ public class ZenModeAutomationSettings extends ZenModeSettingsBase {
             ServiceInfo si = mServiceListing.findService(mContext, CONFIG, rule.getOwner());
             ComponentName settingsActivity = getSettingsActivity(si);
             setIntent(getRuleIntent(action, settingsActivity, mId));
+            setSelectable(settingsActivity != null || isSystemRule);
 
             setWidgetLayoutResource(R.layout.zen_rule_widget);
         }
@@ -323,6 +324,8 @@ public class ZenModeAutomationSettings extends ZenModeSettingsBase {
             if (v != null) {
                 v.setOnClickListener(mDeleteListener);
             }
+            view.setDividerAllowedAbove(true);
+            view.setDividerAllowedBelow(true);
         }
 
         private final View.OnClickListener mDeleteListener = new View.OnClickListener() {