AI-657 : keep closing behavior of pages centralized