CMS - Closing Search Issues

There are two issues closing the search dialog:

• When closing from page properties, this also closes the page properties dialog
• when closing without selecting a value from a component it just displays a loader and does not reopen the editor