Save and Continue Editing does not always take into account the edit mode

For example when you are in Edit class mode it fails to stay in edit class but goes to wiki edit mode
This needs to be verified for all edit modes