fix scope issue in save popups