Under settings > internet connections there are 3 options, they should be as follows:

Connect automatically - Any Connection
Search Interval - (Any except for 'Never)
Switch to WLAN when available - ticked (set to yes)

This should give you what you want, if not, something dodgey might be going on.