Multiple Trigger, Different Actions for Lights

Hi all

I have some lights in the house that are primarily triggered from motion. They switch off if no motion is detected for 3 minutes.

There is however a button that also toggles the lights.

At the moment, these are two separate automations and the lights will turn off based on the motion detection above.

What I would like to do is have the lights trigger from the motion, but if they are turned on from the button then they stay on until the button is pressed again.
Is it possible to combine these two things and have that overall control?

Cheers