CON-1815 | Fix for resizing window