Surveillance Category Management from Node Page is not logic / user workflow dangerous

When editing surveillance category membership from the node page you enter a dialog in which you can move categories left/right to make the node a member of those categories (good). When confirming the selection, you do not get back to the node page (expected result) but end up in the surveillance category management dialog (unexpected result). In this dialog you can delete and edit categories in a global context.
The expected result is that you get back to the node page as you are acting in a node context, not in a global "opennms-system" context.
The risk is that you do not realize that you changed context and try to "re-edit" the category membership and delete a category globally.