Connect/New Window behaviour inconsistent in Favourites Window

The favourites window has inconsistent behaviour.

If I select "Connect" the Favorites Window disappears. However if a window for that connection is open the button changes to "New Window" - clicking on that doesn't cause the Favorites Window to disappear.

Start by reproducing the two actions in the Favorites Window: click "Connect" with no existing connection window, then click "New Window" when one is already open. Trace the Favorites Window behavior in both cases; done means the window behaves consistently after either action.

Written by the indexing model from the issue text.