Fix #1387 - escape / close / window x should not close needs manager when in resource edit mode
Merge pull request #1396 from timlinux/fix-1387

Fix #1387