1 files changed, 12 insertions, 7 deletions
diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Views/JobsView.xaml.cs b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Views/JobsView.xaml.cs
index ceac18e38..23785881d 100644
--- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Views/JobsView.xaml.cs
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Views/JobsView.xaml.cs
@@ -28,17 +28,22 @@ namespace Tango.PPC.Jobs.Views
             TangoIOC.Default.Register<IJobsView>(this);
         }
 
-        private void TouchNavigationLinks_SelectionChanged(object sender, SelectionChangedEventArgs e)
+        private async void TouchNavigationLinks_SelectionChanged(object sender, SelectionChangedEventArgs e)
         {
             if (dataGridJobs != null)
             {
-                //await Task.Delay(200);
+                await Task.Delay(200);
 
-                //dataGridJobs.LayoutRows(false);
-                //dataGridJobs.ScrollViewer.ScrollToTop();
-
-                //dataGridJobsHistory.LayoutRows(false);
-                //dataGridJobsHistory.ScrollViewer.ScrollToTop();
+                if (navigationLinks.SelectedIndex == 0)
+                {
+                    dataGridJobs.LayoutRows(false);
+                    dataGridJobs.ScrollViewer.ScrollToTop();
+                }
+                else
+                {
+                    dataGridJobsHistory.LayoutRows(false);
+                    dataGridJobsHistory.ScrollViewer.ScrollToTop();
+                }
             }
         }