Fix for #1380 - remove in kw editor does not remove kw

Fix #1380 - remove in kw editor does not remove kw