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 4e9737c1361..98b88ea1b3a 100644
--- a/res/layout-xlarge/wifi_settings_for_setup_wizard_xl.xml
+++ b/res/layout-xlarge/wifi_settings_for_setup_wizard_xl.xml
@@ -109,26 +109,29 @@
                 android:text="@string/wifi_forget"
                 android:visibility="gone" />
 
+        <Button android:id="@+id/wifi_setup_add_network"
+                android:layout_width="220dip"
+                android:layout_height="wrap_content"
+                android:layout_above="@+id/wifi_setup_refresh_list"
+                android:textSize="24dip"
+                android:text="@string/wifi_setup_add_network"
+                android:enabled="false" />
+
+        <Button android:id="@+id/wifi_setup_refresh_list"
+                android:layout_width="220dip"
+                android:layout_height="wrap_content"
+                android:layout_above="@+id/wifi_setup_skip_or_next"
+                android:textSize="24dip"
+                android:text="@string/wifi_setup_refresh_list"
+                android:enabled="false" />
+
         <Button android:id="@+id/wifi_setup_skip_or_next"
                 android:layout_width="220dip"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="30dip"
                 android:layout_alignParentBottom="true"
                 android:textSize="24dip"
-                android:text="@string/wifi_setup_skip" />
-
-        <Button android:id="@+id/wifi_setup_refresh_list"
-                android:layout_width="220dip"
-                android:layout_height="wrap_content"
-                android:layout_above="@id/wifi_setup_skip_or_next"
-                android:textSize="24dip"
-                android:text="@string/wifi_setup_refresh_list" />
-
-        <Button android:id="@+id/wifi_setup_add_network"
-                android:layout_width="220dip"
-                android:layout_height="wrap_content"
-                android:layout_above="@id/wifi_setup_refresh_list"
-                android:textSize="24dip"
-                android:text="@string/wifi_setup_add_network" />
+                android:text="@string/wifi_setup_skip"
+                android:enabled="false" />
     </RelativeLayout>
 </LinearLayout>
diff --git a/src/com/android/settings/wifi/WifiSettings.java b/src/com/android/settings/wifi/WifiSettings.java
index 883b8661885..1a8b428f89f 100644
--- a/src/com/android/settings/wifi/WifiSettings.java
+++ b/src/com/android/settings/wifi/WifiSettings.java
@@ -607,7 +607,6 @@ public class WifiSettings extends SettingsPreferenceFragment
         if (mInXlSetupWizard) {
             final Button button =
                     (Button)getActivity().findViewById(R.id.wifi_setup_skip_or_next);
-            button.setEnabled(true);
             if (wifiAvailable) {
                 button.setText(R.string.wifi_setup_next);
             } else {
diff --git a/src/com/android/settings/wifi/WifiSettingsForSetupWizardXL.java b/src/com/android/settings/wifi/WifiSettingsForSetupWizardXL.java
index 3d8c54fd19e..0ddd9da811a 100644
--- a/src/com/android/settings/wifi/WifiSettingsForSetupWizardXL.java
+++ b/src/com/android/settings/wifi/WifiSettingsForSetupWizardXL.java
@@ -61,7 +61,6 @@ public class WifiSettingsForSetupWizardXL extends Activity implements OnClickLis
     private WifiSettings mWifiSettings;
     private TextView mStatusText;
 
-    private StatusBarManager mStatusBarManager;
     private InputMethodManager mInputMethodManager;
 
     // This count reduces every time when there's a notification about WiFi status change.
@@ -87,30 +86,6 @@ public class WifiSettingsForSetupWizardXL extends Activity implements OnClickLis
         setup();
         // XXX: should we use method?
         getIntent().putExtra(WifiSettings.IN_XL_SETUP_WIZARD, true);
-
-        mStatusBarManager = (StatusBarManager)getSystemService(Context.STATUS_BAR_SERVICE);
-    }
-
-    @Override
-    public void onResume() {
-        super.onResume();
-        if (mStatusBarManager != null) {
-            mStatusBarManager.disable(StatusBarManager.DISABLE_EXPAND
-                    | StatusBarManager.DISABLE_NOTIFICATION_ICONS
-                    | StatusBarManager.DISABLE_NOTIFICATION_ALERTS
-                    | StatusBarManager.DISABLE_SYSTEM_INFO
-                    | StatusBarManager.DISABLE_NAVIGATION);
-        } else {
-            Log.e(TAG, "StatusBarManager isn't available.");
-        }
-    }
-
-    @Override
-    public void onStop() {
-        if (mStatusBarManager != null) {
-            mStatusBarManager.disable(StatusBarManager.DISABLE_NONE);
-        }
-        super.onStop();
     }
 
     public void setup() {
@@ -195,6 +170,7 @@ public class WifiSettingsForSetupWizardXL extends Activity implements OnClickLis
             mProgressBar.setProgress(2);
             mProgressText.setText(Summary.get(this, state));
             mStatusText.setText(R.string.wifi_setup_status_proceed_to_next);
+            enableButtons();
 
             if (mIgnoringWifiNotificationCount > 0) {
                 // The network is already available before doing anything. We avoid skip this
@@ -212,6 +188,7 @@ public class WifiSettingsForSetupWizardXL extends Activity implements OnClickLis
             mProgressBar.setProgress(0);
             mStatusText.setText(R.string.wifi_setup_status_select_network);
             mProgressText.setText(Summary.get(this, state));
+            enableButtons();
             break;
         }
         default:  // Not connected.
@@ -225,11 +202,19 @@ public class WifiSettingsForSetupWizardXL extends Activity implements OnClickLis
                 mProgressBar.setProgress(0);
                 mStatusText.setText(R.string.wifi_setup_status_select_network);
                 mProgressText.setText(getString(R.string.wifi_setup_not_connected));
+                enableButtons();
             }
+
             break;
         }
     }
 
+    private void enableButtons() {
+        ((Button)findViewById(R.id.wifi_setup_refresh_list)).setEnabled(true);
+        ((Button)findViewById(R.id.wifi_setup_add_network)).setEnabled(true);
+        ((Button)findViewById(R.id.wifi_setup_skip_or_next)).setEnabled(true);
+    }
+
     public void onWifiConfigPreferenceAttached(boolean isNewNetwork) {
         mStatusText.setText(R.string.wifi_setup_status_edit_network);
     }