On 28 October 1989, the church was handed over to the community of the faithful and consecrated by Father Rafał Władysław Kiernicki. Clean-up of the church and repair and restoration work began.

In the years 1990-1992 the Polish Culture Foundation was involved in the work, carrying out, among other things, repairs and part of the work to replace the roof truss. The Polish Army and the City Council of Cracow financed the purchase of copper sheets for the roofing. In 1991, the parish church in Zhovkva was enriched with a bell cast in the workshop of Jan Felczyński in Przemyśl, funded by Adam Ważny, and two years later a bell was added, donated by former Zhovkva residents.

The painting of Our Lady of the Rosary, known as the Lady of Zhovkva, which was extremely important to the inhabitants of Zhovkva, was located in the Dominican church (now the Greek Catholic church of St. Josaphat) until 1946. Some of the movables from the former Conventus Regalis survived thanks to the evacuation in 1944-1946. The miraculous painting mentioned above, which is now in the Dominican church in Służewo, Warsaw, was re-crowned in 1965 by Primate Stefan Wyszyński. At the request of the faithful from Zhovkva, Małgorzata Sokołowska made a faithful copy of the miraculous painting, which was solemnly handed over to the collegiate church in 1997. During his pilgrimage to Ukraine, at a Mass in Lviv, Pope John Paul II consecrated two golden crowns intended for this image of the Mother of God, funded by Adam Ważny. The solemn coronation Mass in the Zhovkva collegiate church took place on 17 November 2001. The image was crowned by Bishop Stanislaw Padewski of Lviv.

Under the supervision of the conservator Janusz Smaza, Ph.D., students of the Academy of Fine Arts in Warsaw and Krakow started in 1990 a programme of restoration of the gravestones of the Zhovkva, Danilovich and Sobieski families, as well as the epitaphs and stone portals in the church. The work was carried out as part of students' summer internships and through cooperation with qualified art conservators. Until 1995, they were supported by the Warsaw Society for the Care of Monuments together with the Ukrainian Society for the Care of Historical and Cultural Monuments.

Subsequent stages of the work were financed by the now defunct Office of the Government Plenipotentiary for Polish Cultural Heritage Abroad (its duties were taken over by the Department for Polish Cultural Heritage Abroad, then by the Department of Cultural Heritage, and now by the Department for Cultural Heritage Abroad and War Losses in the Ministry of Culture and National Heritage). In addition, the funds of the Office were used to carry out the conservation of the Heart of Jesus (Holy Trinity) altarpiece. This task was realised thanks to the cooperation with the Foundation for the Protection of Monuments, which in 1991-97 carried out the restoration of the pulpit, the altar of Our Lady of Czestochowa and the stalls in Zhovkva (with the financial participation of the General Conservator of Monuments). Subsequent phases of the work since 2006 have been financed for the most part from the funds of the Ministry of Culture and National Heritage thanks to the funds of the Programme "Protection of Cultural Heritage Abroad".

The results of the activities of Polish specialists working under the supervision of dr hab. Janusz Smaza include, among others, the conservation of the figure of St Adalbert the Bishop from the Żółkiewski tombstone, as well as the votive plate dedicated to the anniversary of the Battle of Vienna, the completion of work on the tombstone of Jakub Sobieski and the inscription plaque broken into several dozen pieces, and on the tombstone of Stanisław Daniłowicz. Conservation work was completed on the main portal of the collegiate church and the 17th-century side portal decorated with rosettes. The wall paintings in the chapels of the Virgin Mary and the Holy Trinity were saved. The marble statue of Hetman Żółkiewski, the wall paintings and a number of other furnishings underwent conservation. Work has been completed on the 17th-century polychrome stone choir and the marble consecration plaque. One of the most difficult and labour-intensive stages of the work was the conservation of the vaults with their rich stucco decoration.

Comprehensive restoration works carried out at the collegiate church in Zhovkva since the early 1990s included another element - the conservation of works by Martin Altomonte, The Battle of Vienna and The Battle of the Parklands, from a set of four large-format battle paintings, which occupied a special place in the interior furnishings and ideological programme of the church. After the collegiate church was closed, the paintings were transferred to the Lviv Art Gallery in the 1960s-70s.

In December 2007 two larger paintings were transported to Warsaw: The Battle of Vienna and The Battle of the Parklands (each measuring over 65 square metres), and conservation work began, carried out in 2007-2011.

The five-year conservation project, carried out under the direction of Paweł Sadlej, was financed entirely from the funds of the Ministry of Culture and National Heritage, in the total amount of PLN 4.48 million. The conservation and research work was carried out in Poland by a team of Polish and Ukrainian specialists, under an agreement concluded by the Royal Castle in Warsaw with the Lviv National Art Gallery.

On the Polish side, the Royal Castle in Warsaw, the Wawel Royal Castle and the art conservation departments of the Academy of Fine Arts in Warsaw and Krakow participated in the project.

An integral element of the project was the display of the Battle of Vienna and the Battle of the Parklands after the completion of conservation works. In 2011-2012, the canvases were presented in the Redutowa Rooms of the Grand Theatre of the National Opera in Warsaw and the Museum of Architecture in Wrocław. In spring 2012, the paintings returned to Ukraine. At present, the key question is where to display the conserved paintings, as in June 2012, the Ukrainian side made a unilateral decision to place individual paintings in the castles of Olesko and Zloczów (branches of the Lviv National Art Gallery). The Polish side's unalterable demand is to place the paintings in the historic interiors of the St Lawrence Collegiate Church in Zhovkva, for which the paintings were commissioned by King John III and where they have been kept for more than 250 years.

The conservation work in the former collegiate church focuses on saving the frieze surrounding the collegiate church A team of conservators led by Drs. Janusz Smaza and Andrzej Kazberuk has been carrying it out since 2014. thanks to grants obtained by the Cultural Heritage Foundation under the Programme of the Minister of Culture and National Heritage "Cultural Heritage", priority "Protection of Cultural Heritage Abroad" and the Competition of the Senate of the Republic of Poland (in 2015 the Ministry of Foreign Affairs) "Cooperation with Poles and Poles Abroad".