1 files changed, 12 insertions, 3 deletions
diff --git a/Software/Visual_Studio/Tango.SharedUI/Controls/NavigationControl.cs b/Software/Visual_Studio/Tango.SharedUI/Controls/NavigationControl.cs
index d21a562fd..d7af7200e 100644
--- a/Software/Visual_Studio/Tango.SharedUI/Controls/NavigationControl.cs
+++ b/Software/Visual_Studio/Tango.SharedUI/Controls/NavigationControl.cs
@@ -356,8 +356,10 @@ namespace Tango.SharedUI.Controls
 
         private void Navigate(NavigationElement fromElement, NavigationElement toElement)
         {
-            if (toElement == null) return;
-            if (toElement == fromElement) return;
+            if (toElement == null || toElement == fromElement)
+            {
+                _onCompleted?.Invoke();
+            }
 
             if (fromElement != null)
             {
@@ -516,7 +518,14 @@ namespace Tango.SharedUI.Controls
 
             if (element != null)
             {
-                SelectedElement = element;
+                if (SelectedElement == element)
+                {
+                    _onCompleted?.Invoke();
+                }
+                else
+                {
+                    SelectedElement = element;
+                }
             }
 
             return element;