diff --git a/src/com/android/settings/wifi/WifiSettings2.java b/src/com/android/settings/wifi/WifiSettings2.java
index 30d5ad08da4..d26e8c349c0 100644
--- a/src/com/android/settings/wifi/WifiSettings2.java
+++ b/src/com/android/settings/wifi/WifiSettings2.java
@@ -539,9 +539,11 @@ public class WifiSettings2 extends RestrictedSettingsFragment
             final WifiEntry selectedEntry =
                     ((LongPressWifiEntryPreference) preference).getWifiEntry();
 
-            if (selectedEntry.getWifiConfiguration() != null) {
-                if (!selectedEntry.getWifiConfiguration().getNetworkSelectionStatus()
-                        .hasEverConnected()) {
+            // If the clicked WiFi entry is never connected, launch Wi-Fi edit UI to edit password.
+            if (selectedEntry.getSecurity() != WifiEntry.SECURITY_NONE
+                    && selectedEntry.getSecurity() != WifiEntry.SECURITY_OWE) {
+                final WifiConfiguration config = selectedEntry.getWifiConfiguration();
+                if (config != null && !config.getNetworkSelectionStatus().hasEverConnected()) {
                     launchConfigNewNetworkFragment(selectedEntry);
                     return true;
                 }