diff --git a/ILSpy/Controls/CustomDialog.cs b/ILSpy/Controls/CustomDialog.cs
index b3f33dd51..d51f69c0f 100644
--- a/ILSpy/Controls/CustomDialog.cs
+++ b/ILSpy/Controls/CustomDialog.cs
@@ -51,9 +51,8 @@ namespace ICSharpCode.ILSpy.Controls
 
 			using (Graphics g = this.CreateGraphics())
 			{
-				Rectangle screen = Screen.PrimaryScreen.WorkingArea;
-				SizeF size = g.MeasureString(message, label.Font, screen.Width - 20);
-				Size clientSize = new Size((int)(size.Width * 96 / g.DpiX), (int)(size.Height * 96 / g.DpiY));
+				SizeF size = TextRenderer.MeasureText(message, label.Font);
+				Size clientSize = new Size((int)(size.Width * 96 / g.DpiX) + DockPadding.Left + DockPadding.Right, (int)(size.Height * 96 / g.DpiY) + DockPadding.Top + DockPadding.Bottom);
 				Button[] buttons = new Button[buttonLabels.Length];
 				int[] positions = new int[buttonLabels.Length];
 				int pos = 0;
@@ -65,7 +64,7 @@ namespace ICSharpCode.ILSpy.Controls
 					string buttonLabel = buttonLabels[i];
 					newButton.Text = buttonLabel;
 					newButton.Click += new EventHandler(ButtonClick);
-					SizeF buttonSize = g.MeasureString(buttonLabel, newButton.Font);
+					SizeF buttonSize = TextRenderer.MeasureText(buttonLabel, newButton.Font);
 					newButton.Width = Math.Max(newButton.Width, ((int)Math.Ceiling(buttonSize.Width * 96 / g.DpiX / 8.0) + 1) * 8);
 					positions[i] = pos;
 					buttons[i] = newButton;