diff --git a/Terminal.Gui/Windows/MessageBox.cs b/Terminal.Gui/Windows/MessageBox.cs
index 9d9c74864..8afa8fc5d 100644
--- a/Terminal.Gui/Windows/MessageBox.cs
+++ b/Terminal.Gui/Windows/MessageBox.cs
@@ -238,7 +238,10 @@ namespace Terminal.Gui {
 		static int QueryFull (bool useErrorColors, int width, int height, ustring title, ustring message,
 			int defaultButton = 0, Border border = null, params ustring [] buttons)
 		{
-			const int defaultWidth = 50;
+			int defaultWidth = 50;
+			if (defaultWidth > Application.Driver.Cols / 2) {
+				defaultWidth = (int)(Application.Driver.Cols * 0.60f);
+			}
 			int maxWidthLine = TextFormatter.MaxWidthLine (message);
 			if (maxWidthLine > Application.Driver.Cols) {
 				maxWidthLine = Application.Driver.Cols;
diff --git a/UnitTests/MessageBoxTests.cs b/UnitTests/MessageBoxTests.cs
index 2c79aa299..dc9881551 100644
--- a/UnitTests/MessageBoxTests.cs
+++ b/UnitTests/MessageBoxTests.cs
@@ -30,11 +30,11 @@ namespace Terminal.Gui.Views {
 				} else if (iterations == 1) {
 					Application.Top.Redraw (Application.Top.Bounds);
 					TestHelpers.AssertDriverContentsWithFrameAre (@"
-               ┌ Title ─────────────────────────────────────────┐
-               │                    Message                     │
-               │                                                │
-               │                                                │
-               └────────────────────────────────────────────────┘
+                ┌ Title ───────────────────────────────────────┐
+                │                   Message                    │
+                │                                              │
+                │                                              │
+                └──────────────────────────────────────────────┘
 ", output);
 
 					Application.RequestStop ();