Fix for Issue #811

Changes how code behind in rename dialog is handled.  This should fix the rename dialog issues.