Fixed bug (merging behaviour if popup is showed)