Peugeot 2008 several times boot open warning when i pull off. now car will not lock.

Boot was wedged shut after a piece of fabric got stuck between the mechanism as the lid was shutting around three months ago, managed to use manual release to open and fabric removed, has worked fine since. Today, car boot decided to stick shut again but with no fabric in the mechanism or any blockages occurring. Have managed to open the boot with the manual opening of the mechanism again, but now the boot will not officially lock. Latch is working, and no slack in boot lid, but the door open light is on permanently. When I drive, there is a message about the boot being open, and the car will not lock. Any ideas on next steps? I feel as though the mechanism may well need replacing.