Fix for Issue #811

Changes how code behind in rename dialog is handled
Merge pull request #821 from ReedCopsey/fix_fsxaml_issue

Fix for Issue #811