1 files changed, 9 insertions, 0 deletions
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Navigation/DefaultNavigationManager.cs b/Software/Visual_Studio/PPC/Tango.PPC.UI/Navigation/DefaultNavigationManager.cs
index 3502648d4..7c71ef3d0 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.UI/Navigation/DefaultNavigationManager.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Navigation/DefaultNavigationManager.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.Linq;
 using System.Reflection;
 using System.Runtime.CompilerServices;
@@ -501,6 +502,10 @@ namespace Tango.PPC.UI.Navigation
 
         private void NotifyOnBeforeNavigated(object fromVM, object toVM)
         {
+            IsBackEnabled = false;
+
+            if (fromVM == toVM) return;
+
             if (fromVM is PPCViewModel)
             {
                 (fromVM as PPCViewModel)?.OnBeforeNavigatedFrom();
@@ -514,6 +519,10 @@ namespace Tango.PPC.UI.Navigation
 
         private void NotifyOnNavigated(object fromVM, object toVM)
         {
+            IsBackEnabled = true;
+
+            if (fromVM == toVM) return;
+
             if (fromVM is PPCViewModel)
             {
                 (fromVM as PPCViewModel)?.OnNavigatedFrom();