diff --git a/SafeExamBrowser.UserInterface.Desktop/Windows/LockScreen.xaml.cs b/SafeExamBrowser.UserInterface.Desktop/Windows/LockScreen.xaml.cs
index 5e09cb29..d1952d66 100644
--- a/SafeExamBrowser.UserInterface.Desktop/Windows/LockScreen.xaml.cs
+++ b/SafeExamBrowser.UserInterface.Desktop/Windows/LockScreen.xaml.cs
@@ -138,7 +138,7 @@ namespace SafeExamBrowser.UserInterface.Desktop.Windows
 					FontSize = Message.FontSize,
 					Foreground = Message.Foreground,
 					IsChecked = options.First() == option,
-					Margin = new Thickness(2.5),
+					Margin = new Thickness(2.5, options.First() == option ? 2.5 : 7.5, 2.5, options.Last() == option ? 2.5 : 7.5),
 					Tag = option.Id,
 					VerticalContentAlignment = VerticalAlignment.Center
 				});
diff --git a/SafeExamBrowser.UserInterface.Mobile/Windows/LockScreen.xaml.cs b/SafeExamBrowser.UserInterface.Mobile/Windows/LockScreen.xaml.cs
index d3d16d9c..dec55f27 100644
--- a/SafeExamBrowser.UserInterface.Mobile/Windows/LockScreen.xaml.cs
+++ b/SafeExamBrowser.UserInterface.Mobile/Windows/LockScreen.xaml.cs
@@ -138,7 +138,7 @@ namespace SafeExamBrowser.UserInterface.Mobile.Windows
 					FontSize = Message.FontSize,
 					Foreground = Message.Foreground,
 					IsChecked = options.First() == option,
-					Margin = new Thickness(5),
+					Margin = new Thickness(5, options.First() == option ? 5 : 10, 5, options.Last() == option ? 5 : 10),
 					Tag = option.Id,
 					VerticalContentAlignment = VerticalAlignment.Center
 				});