Fixing bug on popup logic.
2.0.7