Issue 1248 - Fix delete dialog