add window into command handler