#349 - Activate/deactivate active view on popup show hide

#349