Issue 1248 - Fix delete dialog

This is the fix for the issue with the delete dialog that we discussed we wanted in 2.0.1.