With the rapid development of the micro-grid associated with new and clean energies, the smooth switching between grid-connected and islanded operation modes of the micro-grid is a key issue that needs to be addressed urgently. In traditional solutions, V/f (Voltage/frequency) control is adopted for the master micro sources when the micro-grid works in islanded mode, while PQ (real and reactive power) control is adopted when in grid-connected mode. However, when the two controllers switch when mode transfer occurs, transient oscillations usually occur and thereafter the dynamic response will be degraded. This paper considers an archetypical micro-grid with Wind-PV-ES (Wind, Photovoltaic and Energy Storage) hybrid system, which forms the basis of our case study. The underlying reason for such transient oscillation is analyzed in this paper. Thereafter a modified control strategy for seamless mode transfer is designed and implemented. An improved PQ control method is designed by which the output of the PQ controller always synchronously tracks the output of the V/f controller for micro-grid switches from islanded mode to grid-connected; furthermore, a dq rotating coordinate synchronization based V/f control method is proposed for transition from grid-connected mode to islanded mode. Finally, experiments and analysis are undertaken on some basic and important operating cases; the results in our case study indicate that the modified control strategy is effective in dominating the micro-grid during mode transfer and thus yielding significantly better performances.