diff --git a/SafeExamBrowser.UserInterface.Desktop/Windows/Taskbar.xaml.cs b/SafeExamBrowser.UserInterface.Desktop/Windows/Taskbar.xaml.cs index e1937348..6e823b3e 100644 --- a/SafeExamBrowser.UserInterface.Desktop/Windows/Taskbar.xaml.cs +++ b/SafeExamBrowser.UserInterface.Desktop/Windows/Taskbar.xaml.cs @@ -89,12 +89,9 @@ namespace SafeExamBrowser.UserInterface.Desktop.Windows { Activate(); - if (forward) + if (forward && ApplicationStackPanel.Children.Count > 0) { - if (ApplicationStackPanel.Children.Count > 0) - { - SetFocusWithin(ApplicationStackPanel.Children[0]); - } + SetFocusWithin(ApplicationStackPanel.Children[0]); } else { diff --git a/SafeExamBrowser.UserInterface.Mobile/Windows/Taskbar.xaml.cs b/SafeExamBrowser.UserInterface.Mobile/Windows/Taskbar.xaml.cs index 18f4665b..e64d3b8b 100644 --- a/SafeExamBrowser.UserInterface.Mobile/Windows/Taskbar.xaml.cs +++ b/SafeExamBrowser.UserInterface.Mobile/Windows/Taskbar.xaml.cs @@ -88,12 +88,9 @@ namespace SafeExamBrowser.UserInterface.Mobile.Windows { Activate(); - if (fromTop) + if (fromTop && ApplicationStackPanel.Children.Count > 0) { - if (ApplicationStackPanel.Children.Count > 0) - { - ApplicationStackPanel.Children[0].Focus(); - } + ApplicationStackPanel.Children[0].Focus(); } else {