diff --git a/Source/LibationWinForms/AvaloniaUI/MessageBox.cs b/Source/LibationWinForms/AvaloniaUI/MessageBox.cs
index 810999d3..235c8a3f 100644
--- a/Source/LibationWinForms/AvaloniaUI/MessageBox.cs
+++ b/Source/LibationWinForms/AvaloniaUI/MessageBox.cs
@@ -211,6 +211,11 @@ namespace LibationWinForms.AvaloniaUI
 		private static async Task<DialogResult> ShowCore2(Window owner, string message, string caption, MessageBoxButtons buttons, MessageBoxIcon icon, MessageBoxDefaultButton defaultButton)
 		{
 			var dialog = new MessageBoxWindow();
+
+#if WINDOWS7_0
+			HideMinMaxBtns(dialog.PlatformImpl.Handle.Handle);
+#endif
+
 			var vm = new MessageBoxViewModel(message, caption, buttons, icon, defaultButton);
 			dialog.DataContext = vm;
 			dialog.CanResize = false;
@@ -236,6 +241,22 @@ namespace LibationWinForms.AvaloniaUI
 			dialog.Height = dialog.MinHeight;
 			dialog.Width = dialog.MinWidth;
 
+			dialog.Opened += (_, _) =>
+			{
+				switch (defaultButton)
+				{
+					case MessageBoxDefaultButton.Button1:
+						dialog.FindControl<Button>("Button1").Focus();
+						break;
+					case MessageBoxDefaultButton.Button2:
+						dialog.FindControl<Button>("Button2").Focus();
+						break;
+					case MessageBoxDefaultButton.Button3:
+						dialog.FindControl<Button>("Button3").Focus();
+						break;
+
+				}
+			};
 
 			if (owner is null)
 			{
@@ -266,5 +287,22 @@ namespace LibationWinForms.AvaloniaUI
 				return await dialog.ShowDialog<DialogResult>(owner);
 			}
 		}
+
+#if WINDOWS7_0
+
+		private static void HideMinMaxBtns(IntPtr handle)
+		{
+			var currentStyle = GetWindowLong(handle, GWL_STYLE);
+
+			SetWindowLong(handle, GWL_STYLE, currentStyle & ~WS_MAXIMIZEBOX & ~WS_MINIMIZEBOX);
+		}
+		const long WS_MINIMIZEBOX = 0x00020000L;
+		const long WS_MAXIMIZEBOX = 0x10000L;
+		const int GWL_STYLE = -16;
+		[System.Runtime.InteropServices.DllImport("user32.dll", EntryPoint = "GetWindowLong")]
+		static extern long GetWindowLong(IntPtr hWnd, int nIndex);
+		[System.Runtime.InteropServices.DllImport("user32.dll")]
+		static extern int SetWindowLong(IntPtr hWnd, int nIndex, long dwNewLong);
+#endif
 	}
 }
diff --git a/Source/LibationWinForms/AvaloniaUI/Views/Dialogs/MessageBoxWindow.axaml b/Source/LibationWinForms/AvaloniaUI/Views/Dialogs/MessageBoxWindow.axaml
index 9a05521f..968ccbe7 100644
--- a/Source/LibationWinForms/AvaloniaUI/Views/Dialogs/MessageBoxWindow.axaml
+++ b/Source/LibationWinForms/AvaloniaUI/Views/Dialogs/MessageBoxWindow.axaml
@@ -27,6 +27,11 @@
 		</DockPanel>
 
 		<DockPanel Height="45" Grid.Row="1" Background="LightGray">
+			<DockPanel.Styles>
+				<Style Selector="Button:focus">
+					<Setter Property="Background" Value="{DynamicResource SystemAccentColor}" />
+				</Style>
+			</DockPanel.Styles>
 			<StackPanel Orientation="Horizontal" HorizontalAlignment="Right" Margin="5" DockPanel.Dock="Bottom">
 				<Button Grid.Column="0" MinWidth="75" MinHeight="25" Name="Button1" Click="Button1_Click" Margin="5">
 					<TextBlock VerticalAlignment="Center" Text="{Binding Button1Text}"/>