diff --git a/selfdrive/ui/mici/layouts/settings/network/wifi_ui.py b/selfdrive/ui/mici/layouts/settings/network/wifi_ui.py
index 565fef5af3fb7b..a93465a05cd432 100644
--- a/selfdrive/ui/mici/layouts/settings/network/wifi_ui.py
+++ b/selfdrive/ui/mici/layouts/settings/network/wifi_ui.py
@@ -313,11 +313,12 @@ class WifiUIMici(BigMultiOptionDialog):
   # Wait this long after user interacts with widget to update network list
   INACTIVITY_TIMEOUT = 1
 
-  def __init__(self, wifi_manager: WifiManager, back_callback: Callable):
+  def __init__(self, wifi_manager: WifiManager, back_callback: Callable, back_on_activate: bool = False):
     super().__init__([], None, None, right_btn_callback=None)
 
     # Set up back navigation
     self.set_back_callback(back_callback)
+    self.back_on_activate = back_on_activate
 
     self._network_info_page = NetworkInfoPage(wifi_manager, self._connect_to_network, self._forget_network, self._open_network_manage_page)
     self._network_info_page.set_connecting(lambda: self._connecting)
@@ -429,6 +430,10 @@ def _on_need_auth(self, ssid, incorrect_password=True):
 
   def _on_activated(self):
     self._connecting = None
+    if self.back_on_activate:
+      # Close the overlay and go back
+      gui_app.set_modal_overlay(None)
+      self._back_callback()
 
   def _on_forgotten(self):
     self._connecting = None
diff --git a/system/ui/mici_setup.py b/system/ui/mici_setup.py
index 2c6090b4ac51f1..7f3caf8f8c654d 100755
--- a/system/ui/mici_setup.py
+++ b/system/ui/mici_setup.py
@@ -435,7 +435,7 @@ class NetworkSetupState(IntEnum):
 class NetworkSetupPage(Widget):
   def __init__(self, wifi_manager, continue_callback: Callable, back_callback: Callable):
     super().__init__()
-    self._wifi_ui = WifiUIMici(wifi_manager, back_callback=lambda: self.set_state(NetworkSetupState.MAIN))
+    self._wifi_ui = WifiUIMici(wifi_manager, back_callback=lambda: self.set_state(NetworkSetupState.MAIN), back_on_activate=True)
 
     self._no_wifi_txt = gui_app.texture("icons_mici/settings/network/wifi_strength_slash.png", 58, 50)
     self._wifi_full_txt = gui_app.texture("icons_mici/settings/network/wifi_strength_full.png", 58, 50)