diff --git a/python_payload/apps/w1f1/__init__.py b/python_payload/apps/w1f1/__init__.py
index 59ebe05459060c1092409652336de92d45d011fe..25932226a8c879b9394390a2827e2bd3a59615e2 100644
--- a/python_payload/apps/w1f1/__init__.py
+++ b/python_payload/apps/w1f1/__init__.py
@@ -231,7 +231,9 @@ class WifiApp(Application):
                 self._waiting_for_password = True
                 self.vm.push(KeyboardView(self._password_model))
 
-        if self._waiting_for_password and not self.vm._history:
+        if self._waiting_for_password and (
+            not self.vm._history or not isinstance(self.vm._history[-1], WifiApp)
+        ):
             ssid = self._nearby_wlans[self._wlan_offset][0].decode()
             psk = self._password_model.text
             print(ssid, psk)
diff --git a/python_payload/apps/w1f1/flow3r.toml b/python_payload/apps/w1f1/flow3r.toml
index e5b2998e9444084c9f6a886ec8a51095899f8504..2e666767d5443ab8793b93c2b4ce15f6d4a2df1b 100644
--- a/python_payload/apps/w1f1/flow3r.toml
+++ b/python_payload/apps/w1f1/flow3r.toml
@@ -10,4 +10,4 @@ author = "ave"
 license = "LGPL-3.0-only"
 url = "https://git.flow3r.garden/flow3r/flow3r-firmware"
 description = "Lets you use multiple wireless networks."
-version = 2
+version = 3