1 files changed, 4 insertions, 5 deletions
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Navigation/NavigationHistoryService.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Navigation/NavigationHistoryService.cs
index a1af09c25c..c8ff32acb6 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Navigation/NavigationHistoryService.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Navigation/NavigationHistoryService.cs
@@ -349,12 +349,11 @@ namespace MonoDevelop.Ide.Navigation
 			bool closedHistoryChanged = false;
 			foreach (ProjectFileRenamedEventInfo args in e) {
 				foreach (NavigationHistoryItem point in history) {
-					DocumentNavigationPoint dp = point.NavigationPoint as DocumentNavigationPoint;
+					var dp = point.NavigationPoint as DocumentNavigationPoint;
 					historyChanged &= (dp != null && dp.HandleRenameEvent (args.OldName, args.NewName));
-				}
-				foreach (NavigationHistoryItem point in history) {
-					DocumentNavigationPoint cdp = point.NavigationPoint as DocumentNavigationPoint;
-					closedHistoryChanged &= (cdp != null && cdp.HandleRenameEvent (args.OldName, args.NewName));
+					closedHistoryChanged &= (dp != null && dp.HandleRenameEvent (args.OldName, args.NewName));
+					if (historyChanged && closedHistoryChanged)
+						break;
 				}
 			}
 			if (historyChanged)