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 5de91f1c9ff..b4fdf11d89f 100644
--- a/res/layout-xlarge/wifi_settings_for_setup_wizard_xl.xml
+++ b/res/layout-xlarge/wifi_settings_for_setup_wizard_xl.xml
@@ -95,6 +95,22 @@
             android:layout_width="match_parent"
             android:layout_height="360dip"
             android:visibility="gone" />
+        <LinearLayout
+            android:id="@+id/connecting_status_layout"
+            android:layout_width="match_parent"
+            android:layout_height="360dip"
+            android:visibility="gone">
+            <TextView
+                android:id="@+id/connecting_status"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:lineSpacingExtra="12dip"
+                android:inputType="textMultiLine"
+                android:textAppearance="?android:attr/textAppearanceMedium"
+                android:clickable="false"
+                android:longClickable="false" />
+        </LinearLayout>
+
     </RelativeLayout>
 
     <!-- Divider -->
diff --git a/res/layout/wifi_config_ui_for_setup_wizard.xml b/res/layout/wifi_config_ui_for_setup_wizard.xml
index 08aa48da74c..da145d7074f 100644
--- a/res/layout/wifi_config_ui_for_setup_wizard.xml
+++ b/res/layout/wifi_config_ui_for_setup_wizard.xml
@@ -85,30 +85,39 @@
                   android:text="@string/wifi_show_password" />
     </LinearLayout>
     <LinearLayout android:id="@+id/type"
-                 android:layout_width="match_parent"
-                 android:layout_height="wrap_content"
-                 android:orientation="vertical"
-                 android:visibility="gone">
+                  android:layout_width="match_parent"
+                  android:layout_height="wrap_content"
+                  android:orientation="vertical"
+                  android:visibility="gone">
+        <LinearLayout android:layout_width="match_parent"
+                      android:layout_height="wrap_content"
+                      android:minHeight="48dip"
+                      android:orientation="horizontal">
+            <TextView android:layout_width="wrap_content"
+                      android:minWidth="112dip"
+                      android:layout_height="wrap_content"
+                      android:text="@string/wifi_ssid" />
+            <EditText android:id="@+id/ssid"
+                      android:layout_width="398dip"
+                      android:layout_height="wrap_content"
+                      android:singleLine="true"
+                      android:inputType="textNoSuggestions" />
+        </LinearLayout>
 
-       <TextView android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                 android:text="@string/wifi_ssid" />
-
-       <EditText android:id="@+id/ssid"
-                 android:layout_width="match_parent"
-                 android:layout_height="wrap_content"
-                 android:singleLine="true"
-                 android:inputType="textNoSuggestions" />
-
-       <TextView android:layout_width="match_parent"
-                 android:layout_height="wrap_content"
-                 android:text="@string/wifi_security" />
-
-       <Spinner android:id="@+id/security"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:prompt="@string/wifi_security"
-                android:entries="@array/wifi_security" />
+        <LinearLayout android:layout_width="match_parent"
+                      android:layout_height="wrap_content"
+                      android:minHeight="48dip"
+                      android:orientation="horizontal">
+            <TextView android:layout_width="wrap_content"
+                      android:minWidth="112dip"
+                      android:layout_height="wrap_content"
+                      android:text="@string/wifi_security" />
+            <Spinner android:id="@+id/security"
+                     android:layout_width="398dip"
+                     android:layout_height="wrap_content"
+                     android:prompt="@string/wifi_security"
+                     android:entries="@array/wifi_security" />
+        </LinearLayout>
     </LinearLayout> <!-- android:id="@+id/type" -->
 
     <LinearLayout android:id="@+id/eap_not_supported"
diff --git a/src/com/android/settings/wifi/WifiSettingsForSetupWizardXL.java b/src/com/android/settings/wifi/WifiSettingsForSetupWizardXL.java
index 55a9fed6aa7..bbeabda8804 100644
--- a/src/com/android/settings/wifi/WifiSettingsForSetupWizardXL.java
+++ b/src/com/android/settings/wifi/WifiSettingsForSetupWizardXL.java
@@ -96,6 +96,9 @@ public class WifiSettingsForSetupWizardXL extends Activity implements OnClickLis
     private Button mConnectButton;
     private Button mBackButton;
 
+    private View mConnectingStatusLayout;
+    private TextView mConnectingStatusView;
+
     // true when a user already pressed "Connect" button and waiting for connection.
     // Also true when the device is already connected to a wifi network on launch.
     private boolean mAfterConnectAction;
@@ -165,6 +168,9 @@ public class WifiSettingsForSetupWizardXL extends Activity implements OnClickLis
         mTopPadding = findViewById(R.id.top_padding);
         mWifiConfigPadding = findViewById(R.id.wifi_config_padding);
 
+        mConnectingStatusLayout = findViewById(R.id.connecting_status_layout);
+        mConnectingStatusView = (TextView) findViewById(R.id.connecting_status);
+
         // At first, Wifi module doesn't return SCANNING state (it's too early), so we manually
         // show it.
         showScanningStatus();
@@ -254,6 +260,7 @@ public class WifiSettingsForSetupWizardXL extends Activity implements OnClickLis
             mProgressBar.setProgress(2);
 
             showConnectedTitle();
+            mConnectingStatusView.setText(R.string.wifi_setup_description_connected);
             mConnectButton.setVisibility(View.GONE);
             mAddNetworkButton.setVisibility(View.GONE);
             mRefreshButton.setVisibility(View.GONE);
@@ -344,6 +351,7 @@ public class WifiSettingsForSetupWizardXL extends Activity implements OnClickLis
         mWifiSettings.pauseWifiScan();
 
         findViewById(R.id.wifi_setup).setVisibility(View.GONE);
+        mConnectingStatusLayout.setVisibility(View.GONE);
         final ViewGroup parent = (ViewGroup)findViewById(R.id.wifi_config_ui);
         parent.setVisibility(View.VISIBLE);
         parent.removeAllViews();
@@ -422,6 +430,14 @@ public class WifiSettingsForSetupWizardXL extends Activity implements OnClickLis
             typeView.setVisibility(View.GONE);
         }
 
+        // TODO: investigate whether visibility handling above is needed. Now that we hide
+        // them completely when connecting, so we may not need to do so, though we probably
+        // need to show software keyboard conditionaly.
+        final ViewGroup parent = (ViewGroup)findViewById(R.id.wifi_config_ui);
+        parent.setVisibility(View.GONE);
+        mConnectingStatusLayout.setVisibility(View.VISIBLE);
+        mConnectingStatusView.setText(R.string.wifi_setup_description_connecting);
+
         mHandler.removeCallbacks(mSkipButtonEnabler);
         mSkipOrNextButton.setVisibility(View.VISIBLE);
         mSkipOrNextButton.setEnabled(false);
@@ -456,6 +472,7 @@ public class WifiSettingsForSetupWizardXL extends Activity implements OnClickLis
         }
 
         findViewById(R.id.wifi_setup).setVisibility(View.VISIBLE);
+        mConnectingStatusLayout.setVisibility(View.GONE);
         final ViewGroup parent = (ViewGroup)findViewById(R.id.wifi_config_ui);
         parent.removeAllViews();
         parent.setVisibility(View.GONE);
@@ -523,6 +540,10 @@ public class WifiSettingsForSetupWizardXL extends Activity implements OnClickLis
             showEditingTitle();
         }
 
+        final ViewGroup parent = (ViewGroup)findViewById(R.id.wifi_config_ui);
+        parent.setVisibility(View.VISIBLE);
+        mConnectingStatusLayout.setVisibility(View.GONE);
+
         // Restore View status which was tweaked on connection.
         final View wpsFieldView = findViewById(R.id.wps_fields);
         if (wpsFieldView != null) {