diff --git a/src/com/android/settings/wifi/AddNetworkFragment.java b/src/com/android/settings/wifi/AddNetworkFragment.java
index 38bc0b592c4..aa8e840e38d 100644
--- a/src/com/android/settings/wifi/AddNetworkFragment.java
+++ b/src/com/android/settings/wifi/AddNetworkFragment.java
@@ -206,6 +206,9 @@ public class AddNetworkFragment extends InstrumentedFragment implements WifiConf
 
     @VisibleForTesting
     void handleSubmitAction() {
+        if (!mUIController.canFinish()) {
+            return;
+        }
         successfullyFinish(mUIController.getConfig());
     }
 
@@ -234,9 +237,6 @@ public class AddNetworkFragment extends InstrumentedFragment implements WifiConf
 
             activity.getSystemService(WifiManager.class).save(config, saveListener);
         } else {
-            if (!mUIController.canFinish()) {
-                return;
-            }
             Intent intent = new Intent();
             intent.putExtra(WIFI_CONFIG_KEY, config);
             activity.setResult(Activity.RESULT_OK, intent);