Bug fix: popup overflow