#407 Fixed creation of draft widget