Fixed clean-up of windows after entry / save