Fix Remove Dialog

Not Tested but should work.