[OFFAPPS-122] Fix the popup bug

:bug:

Fix the popup bug.

JIRA: https://zendesk.atlassian.net/browse/OFFAPPS-122

![demo](https://f.cloud.github.com/assets/172804/1280002/560aa64e-2f46-11e3-992b-bca1f3694e4e.gif)

/cc @maximeprades