Block editor changes scale

I searched the forums but didn't find anything on this problem. 

Here is the problem.  When you enter model space through the maximized viewport the block editor will change your annotation to 1:1.

For example: If I am working through the maximized viewport and edit a block. When I close the block editor, If there is more than one viewport I am brought back to the drawing through the next viewport, not the one I was working in. Then I have to go to the correct viewport, once there the annotation through the maximized viewport is 1:1.  Paper space still tells you your scale is the same. To correct this you have to go to paper space, unlock your viewport, pick any other scale, go back to the scale you want, then go back through the maximized viewport. Is there a setting that needs to be changed? Or a fix to correct the problem?

Thanks,

Sarah Heath

Image may be NSFW.
Clik here to view.Image may be NSFW.
Clik here to view.Image may be NSFW.
Clik here to view.Image may be NSFW.
Clik here to view.Image may be NSFW.
Clik here to view.

Image may be NSFW.
Clik here to view.