A user equipment, UE, (20) determines a mobility state of a Wi-Fi access point, AP, as one of a moving mobility state and a non-moving mobility state along with control information relating to UE cell (re-)selection and/or handover behavior based on the determined mobility state of the Wi-Fi access point, AP. The UE then controls its cell (re-)selection and/or handover behavior in relation to the Wi-Fi access point, AP based on the determined control information. In a preferred embodiment, the UE can communicate with a cellular base station, BS, and with the Wi-Fi access point, AP. The UE detects the Wi-Fi AP, determines that the Wi-Fi AP is moving based on a moving AP indication, and controls cell (re-Selection and/or handover behavior of the UE based on the determination that the Wi-Fi AP is moving along with other information.