Thanks!
This should additionally at minimum change the hover text of the button to reflect the two stages, and ideally have two separate icons. (@misolori for input re. icons)

I wouldn't create a separate icon for this, we already do this in the Settings & Keyboard Shortcut search input (though it's a single input). I'd ensure you update the title properly.

I also think this should be behind a setting as people will be split on a preference. I'd personally want it to clear everything on a single click.

Happy to take a look at both the title, and the setting.

Any preference on what the default behaviour should be for clearing?

@JacksonKearl what are you thinking that the title should be updated to say?

Thanks @roblourens! I'll hold fire for now then.

I don't know that we need to update the title, I think that it already will say "Clear Search Results" when there are no search results and it is just clearing the input box. If we want to be totally specific, I think there would 3 states.

• "Clear Search Results" whenever there are search results because we need to be clear that those are going away
• "Clear Search Query"
• "Clear Extra Query Fields" or something like that

But I don't know that it's necessary, what do you think @JacksonKearl?

Also I think we're fine without extra icons.

I'm convinced; people will probably discover it anyways if they need it.

Just to be clear, this is the behaviour I see in the Insiders' Build:

The first click clears the search results and the query/replace terms and does not affect the Files to Include/Exclude fields.

The second click clears the Files to Include/Exclude fields.

I like this, it just wasn't clear from the preceding comments that this was how it would turn out.