diff --git a/src/com/android/settings/wifi/WifiConfigController.java b/src/com/android/settings/wifi/WifiConfigController.java
index 3852cc92594..5a7f68d56dd 100644
--- a/src/com/android/settings/wifi/WifiConfigController.java
+++ b/src/com/android/settings/wifi/WifiConfigController.java
@@ -274,8 +274,9 @@ public class WifiConfigController implements TextWatcher,
     void enableSubmitIfAppropriate() {
         Button submit = mConfigUi.getSubmitButton();
         if (submit == null) return;
-        boolean enabled = false;
+        if (mPasswordView == null) return;
 
+        boolean enabled = false;
         boolean passwordInvalid = false;
 
         /* Check password invalidity for manual network set up alone */