diff --git a/RetailCoder.VBE/Refactorings/Rename/RenameRefactoring.cs b/RetailCoder.VBE/Refactorings/Rename/RenameRefactoring.cs
index 9743910dd1..a588173ab6 100644
--- a/RetailCoder.VBE/Refactorings/Rename/RenameRefactoring.cs
+++ b/RetailCoder.VBE/Refactorings/Rename/RenameRefactoring.cs
@@ -80,17 +80,18 @@ public void Refactor(Declaration target)
 
             var oldSelection = Selection.Home;
             var pane = _vbe.ActiveCodePane;
+            if (!pane.IsWrappingNullReference)
             {
-                if (!pane.IsWrappingNullReference)
-                {
-                    oldSelection = pane.GetSelection();
-                }
+                oldSelection = pane.GetSelection();
+            }
 
-                if (_model != null && _model.Declarations != null)
-                {
-                    Rename();
-                }
+            if (_model != null && _model.Declarations != null)
+            {
+                Rename();
+            }
 
+            if (!pane.IsWrappingNullReference)
+            {
                 pane.SetSelection(oldSelection);
             }
         }