diff --git a/res/values/themes.xml b/res/values/themes.xml
index 4c25da7a43b..e3010a64ebd 100644
--- a/res/values/themes.xml
+++ b/res/values/themes.xml
@@ -114,6 +114,21 @@
         <item name="android:windowAnimationStyle">@null</item>
     </style>
 
+    <style name="GlifV2Theme.Transparent">
+        <item name="android:windowBackground">@android:color/transparent</item>
+        <item name="android:windowNoTitle">true</item>
+        <item name="android:windowIsFloating">true</item>
+        <item name="android:windowAnimationStyle">@null</item>
+    </style>
+
+    <style name="GlifV2Theme.Light.Transparent">
+        <item name="android:windowBackground">@android:color/transparent</item>
+        <item name="android:windowNoTitle">true</item>
+        <item name="android:windowIsFloating">true</item>
+        <item name="android:windowAnimationStyle">@null</item>
+    </style>
+
+
     <style name="SuwSuggestionThemeGlif.Light" parent="SuwThemeGlif.Light">
         <item name="android:windowAnimationStyle">@android:style/Animation.Activity</item>
     </style>
diff --git a/src/com/android/settings/SetupWizardUtils.java b/src/com/android/settings/SetupWizardUtils.java
index d53abae881c..e3e49eb71aa 100644
--- a/src/com/android/settings/SetupWizardUtils.java
+++ b/src/com/android/settings/SetupWizardUtils.java
@@ -48,11 +48,16 @@ public class SetupWizardUtils {
     }
 
     public static int getTransparentTheme(Intent intent) {
-        if (WizardManagerHelper.isLightTheme(intent, true)) {
-            return R.style.SetupWizardTheme_Light_Transparent;
-        } else {
-            return R.style.SetupWizardTheme_Transparent;
+        final int suwTheme = getTheme(intent);
+        int wifiDialogTheme = R.style.GlifV2Theme_Light_Transparent;
+        if (suwTheme == R.style.GlifV2Theme) {
+            wifiDialogTheme = R.style.GlifV2Theme_Transparent;
+        } else if (suwTheme == R.style.GlifTheme_Light) {
+            wifiDialogTheme = R.style.SetupWizardTheme_Light_Transparent;
+        } else if (suwTheme == R.style.GlifTheme) {
+            wifiDialogTheme = R.style.SetupWizardTheme_Transparent;
         }
+        return wifiDialogTheme;
     }
 
     public static void copySetupExtras(Intent fromIntent, Intent toIntent) {