diff --git a/res/layout-xlarge/wifi_settings_for_setup_wizard_xl.xml b/res/layout-xlarge/wifi_settings_for_setup_wizard_xl.xml
index 1b07813e959..f755563ed08 100644
--- a/res/layout-xlarge/wifi_settings_for_setup_wizard_xl.xml
+++ b/res/layout-xlarge/wifi_settings_for_setup_wizard_xl.xml
@@ -72,13 +72,24 @@
             android:visibility="gone" />
     </FrameLayout>
 
+    <!-- Dummy view to have the left edge of following Views.
+         @id/content needs to have layout_width="match_parent" to accommodate
+         every views inside @id/wifi_config_ui while sometimes config ui becomes
+         very wide. -->
+    <View
+        android:id="@+id/dummy_for_left_edge"
+        android:layout_width="716dip"
+        android:layout_height="0dip"
+        android:layout_below="@id/top_divider"
+        android:layout_centerHorizontal="true" />
+
     <RelativeLayout
         android:id="@+id/content"
-        android:layout_width="716dip"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_below="@id/top_divider"
-        android:layout_centerHorizontal="true"
-        android:layout_marginBottom="0dip">
+        android:layout_alignLeft="@id/dummy_for_left_edge"
+        android:layout_centerHorizontal="true">
 
         <!-- Padding for @id/content shown when keyboard isn't available -->
         <View
@@ -89,8 +100,8 @@
 
         <FrameLayout
             android:id="@+id/wifi_settings_fragment_layout"
-            android:layout_width="match_parent"
-            android:layout_height="377dip">
+            android:layout_width="716dip"
+            android:layout_height="370dip">
             <fragment
                 class="com.android.settings.wifi.WifiSettings"
                 android:id="@+id/wifi_setup_fragment"
@@ -108,7 +119,7 @@
             android:visibility="gone" />
         <LinearLayout
             android:id="@+id/connecting_status_layout"
-            android:layout_width="match_parent"
+            android:layout_width="716dip"
             android:layout_height="360dip"
             android:layout_marginTop="10dip"
             android:visibility="gone">