diff --git a/TBF/BenchControl/Operations/MessageBoxForm.Designer.cs b/TBF/BenchControl/Operations/MessageBoxForm.Designer.cs
index 51db86fe6..70d405e91 100644
--- a/TBF/BenchControl/Operations/MessageBoxForm.Designer.cs
+++ b/TBF/BenchControl/Operations/MessageBoxForm.Designer.cs
@@ -66,10 +66,13 @@ namespace TBF.BenchControl.Operations
             this.Controls.Add(this.messageLabel);
             this.Controls.Add(this.okButton);
             this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;
+            this.MaximizeBox = false;
+            this.MinimizeBox = false;
             this.Name = "MessageBoxForm";
             this.SizeGripStyle = System.Windows.Forms.SizeGripStyle.Hide;
             this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
             this.TopMost = true;
+            this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.MessageBoxForm_FormClosing);
             this.ResumeLayout(false);
             this.PerformLayout();
 
diff --git a/TBF/BenchControl/Operations/MessageBoxForm.cs b/TBF/BenchControl/Operations/MessageBoxForm.cs
index e20d5cf1e..4a8e56820 100644
--- a/TBF/BenchControl/Operations/MessageBoxForm.cs
+++ b/TBF/BenchControl/Operations/MessageBoxForm.cs
@@ -18,7 +18,7 @@ namespace TBF.BenchControl.Operations
 		public MessageBoxForm(string message, Color backgroundColor)
 		{
 			InitializeComponent();
-            ControlBox = false;
+            //ControlBox = false;
 
 			Localize();
 			messageLabel.Text = message;
@@ -67,5 +67,10 @@ namespace TBF.BenchControl.Operations
 		}
 
 		#endregion
+
+        private void MessageBoxForm_FormClosing(object sender, FormClosingEventArgs e)
+        {
+            completed = true;
+        }
 	}
 }