FL-1694: Restore new window functionality