diff --git a/src/com/android/settings/widget/AppSwitchPreference.java b/src/com/android/settings/widget/AppSwitchPreference.java
index 90f1dbd..aeb779f 100644
--- a/src/com/android/settings/widget/AppSwitchPreference.java
+++ b/src/com/android/settings/widget/AppSwitchPreference.java
@@ -36,7 +36,8 @@
         super.onBindViewHolder(holder);
         final View switchView = holder.findViewById(android.R.id.switch_widget);
         if (switchView != null) {
-            switchView.setFilterTouchesWhenObscured(true);
+            final View rootView = switchView.getRootView();
+            rootView.setFilterTouchesWhenObscured(true);
         }
     }
 }
diff --git a/src/com/android/settings/widget/FilterTouchesRestrictedSwitchPreference.java b/src/com/android/settings/widget/FilterTouchesRestrictedSwitchPreference.java
index c5e0217..f4c3a14 100644
--- a/src/com/android/settings/widget/FilterTouchesRestrictedSwitchPreference.java
+++ b/src/com/android/settings/widget/FilterTouchesRestrictedSwitchPreference.java
@@ -52,7 +52,8 @@
         super.onBindViewHolder(holder);
         final View switchView = holder.findViewById(android.R.id.switch_widget);
         if (switchView != null) {
-            switchView.setFilterTouchesWhenObscured(true);
+            final View rootView = switchView.getRootView();
+            rootView.setFilterTouchesWhenObscured(true);
         }
     }
 }
diff --git a/src/com/android/settings/widget/FilterTouchesSwitchPreference.java b/src/com/android/settings/widget/FilterTouchesSwitchPreference.java
index a4e3c6e..1b4d681 100644
--- a/src/com/android/settings/widget/FilterTouchesSwitchPreference.java
+++ b/src/com/android/settings/widget/FilterTouchesSwitchPreference.java
@@ -50,7 +50,8 @@
         super.onBindViewHolder(holder);
         final View switchView = holder.findViewById(android.R.id.switch_widget);
         if (switchView != null) {
-            switchView.setFilterTouchesWhenObscured(true);
+            final View rootView = switchView.getRootView();
+            rootView.setFilterTouchesWhenObscured(true);
         }
     }
 }
