diff --git a/src/devices/wifi/nm-device-wifi.c b/src/devices/wifi/nm-device-wifi.c
index 99e35a9651..68c6745295 100644
--- a/src/devices/wifi/nm-device-wifi.c
+++ b/src/devices/wifi/nm-device-wifi.c
@@ -2346,9 +2346,9 @@ act_stage1_prepare (NMDevice *device, NMDeviceStateReason *reason)
 	ap_path = nm_exported_object_export (NM_EXPORTED_OBJECT (ap));
 	g_hash_table_insert (priv->aps, (gpointer) ap_path, ap);
 	g_object_freeze_notify (G_OBJECT (self));
-	set_current_ap (self, ap, FALSE, FALSE);
 	emit_ap_added_removed (self, ACCESS_POINT_ADDED, ap, TRUE);
 	g_object_thaw_notify (G_OBJECT (self));
+	set_current_ap (self, ap, FALSE, FALSE);
 	nm_active_connection_set_specific_object (NM_ACTIVE_CONNECTION (req), ap_path);
 	return NM_ACT_STAGE_RETURN_SUCCESS;