diff --git a/src/com/android/settings/applications/manageapplications/ApplicationViewHolder.java b/src/com/android/settings/applications/manageapplications/ApplicationViewHolder.java
index 5dd1e43b77c..9ef66010070 100644
--- a/src/com/android/settings/applications/manageapplications/ApplicationViewHolder.java
+++ b/src/com/android/settings/applications/manageapplications/ApplicationViewHolder.java
@@ -159,6 +159,9 @@ public class ApplicationViewHolder extends RecyclerView.ViewHolder {
         if (mSwitch != null && mWidgetContainer != null) {
             mWidgetContainer.setOnClickListener(listener);
             mWidgetContainer.setFocusable(false);
+            mWidgetContainer.setClickable(false);
+            mSwitch.setFocusable(true);
+            mSwitch.setClickable(true);
             mSwitch.setChecked(checked);
             mSwitch.setEnabled(enabled);
         }