diff --git a/src/com/android/settings/wifi/WifiConfigController.java b/src/com/android/settings/wifi/WifiConfigController.java
index 2f8ae549106..3852cc92594 100644
--- a/src/com/android/settings/wifi/WifiConfigController.java
+++ b/src/com/android/settings/wifi/WifiConfigController.java
@@ -271,7 +271,7 @@ public class WifiConfigController implements TextWatcher,
     }
 
     /* show submit button if password, ip and proxy settings are valid */
-    private void enableSubmitIfAppropriate() {
+    void enableSubmitIfAppropriate() {
         Button submit = mConfigUi.getSubmitButton();
         if (submit == null) return;
         boolean enabled = false;
diff --git a/src/com/android/settings/wifi/WifiDialog.java b/src/com/android/settings/wifi/WifiDialog.java
index f980d0c3080..82b0cc6180e 100644
--- a/src/com/android/settings/wifi/WifiDialog.java
+++ b/src/com/android/settings/wifi/WifiDialog.java
@@ -56,6 +56,9 @@ class WifiDialog extends AlertDialog implements WifiConfigUiBase {
         setInverseBackgroundForced(true);
         mController = new WifiConfigController(this, mView, mAccessPoint, mEdit);
         super.onCreate(savedInstanceState);
+        /* During creation, the submit button can be unavailable to determine
+         * visibility. Right after creation, update button visibility */
+        mController.enableSubmitIfAppropriate();
     }
 
     @Override