NXP-10258: fix misplaced disable of save popup