diff --git a/packages/SystemUI/res/values/arrays_tv.xml b/packages/SystemUI/res/values/arrays_tv.xml
index 08b1ab14ad083..e52c5db9d227b 100644
--- a/packages/SystemUI/res/values/arrays_tv.xml
+++ b/packages/SystemUI/res/values/arrays_tv.xml
@@ -17,9 +17,13 @@
  */
 -->
 <resources>
-    <!-- List of package name or class name which are considered as Settings,
+    <!-- List of package names or class names which are considered as Settings,
          so PIP location should be adjusted to the left of the side panel.
-         This can be overriden in an overlay -->
+         If it should be applied for all activities in a package, add the package name.
+         If it should be applied for an activity in a package, add its class name with package name.
+         The class name must follow format 'package_name/.class_name' ('/.' in between).
+         This can be overriden in an overlay.
+         -->
     <string-array name="tv_pip_settings_class_name" translatable="false">
         <item>com.android.tv.settings</item>
         <item>com.google.android.leanbacklauncher/.settings.HomeScreenSettingsActivity</item>
diff --git a/packages/SystemUI/src/com/android/systemui/pip/tv/PipManager.java b/packages/SystemUI/src/com/android/systemui/pip/tv/PipManager.java
index df01aab94a1ec..20866c06b16bf 100644
--- a/packages/SystemUI/src/com/android/systemui/pip/tv/PipManager.java
+++ b/packages/SystemUI/src/com/android/systemui/pip/tv/PipManager.java
@@ -242,12 +242,17 @@ public class PipManager implements BasePipManager {
                             entry = Pair.<String, String>create(packageAndClassName[0], null);
                             break;
                         case 2:
-                            entry = Pair.<String, String>create(
-                                    packageAndClassName[0],
-                                    packageAndClassName[0] + packageAndClassName[1]);
+                            if (packageAndClassName[1] != null
+                                    && packageAndClassName[1].startsWith(".")) {
+                                entry = Pair.<String, String>create(
+                                        packageAndClassName[0],
+                                        packageAndClassName[0] + packageAndClassName[1]);
+                            }
                     }
                     if (entry != null) {
                         sSettingsPackageAndClassNamePairList.add(entry);
+                    } else {
+                        Log.w(TAG, "Ignoring malformed settings name " + settings[i]);
                     }
                 }
             }