Only include Flagged email in Inbox

I like the Flagged email smart list, however it includes Flagged email from all folders.

My normal workflow is to Flag a message and leave in the Inbox, and then when done, move the message to the Archive folder.

But, with To Do, all those flagged messages in Archive are in the Flagged email smart list.

I've manually been marking the message as complete before archiving (and using a smart step to do this), but that seems like an extra step.

So, is there a way to create a custom smart list that just looks for Flagged emails in a folder (Inbox)?