Added preview window workaround