diff --git a/src/System.Windows.Forms.Design.Editors/src/System/Drawing/Design/FontNameEditor.cs b/src/System.Windows.Forms.Design.Editors/src/System/Drawing/Design/FontNameEditor.cs
index 42287c4c9f0..d8eacc1d6e4 100644
--- a/src/System.Windows.Forms.Design.Editors/src/System/Drawing/Design/FontNameEditor.cs
+++ b/src/System.Windows.Forms.Design.Editors/src/System/Drawing/Design/FontNameEditor.cs
@@ -14,6 +14,7 @@ namespace System.Drawing.Design
     [System.Security.Permissions.PermissionSetAttribute(System.Security.Permissions.SecurityAction.InheritanceDemand, Name = "FullTrust")]
     public class FontNameEditor : UITypeEditor
     {
+        private const float ScaleFactor = 1.5f;
         private static readonly FontStyle[] s_FontStyles = new[]
         {
              FontStyle.Regular,
@@ -69,8 +70,6 @@ public override void PaintValue(PaintValueEventArgs e)
                         }
                     }
                 }
-
-                e.Graphics.DrawLine(SystemPens.WindowFrame, e.Bounds.Right, e.Bounds.Y, e.Bounds.Right, e.Bounds.Bottom);
             }
             catch
             {
@@ -85,10 +84,14 @@ public override void PaintValue(PaintValueEventArgs e)
         /// </summary>
         private static void DrawFontSample(PaintValueEventArgs e, FontFamily fontFamily, FontStyle fontStyle)
         {
-            float fontSize = (float)(e.Bounds.Height / 1.2);
+            float fontSize = e.Bounds.Height / ScaleFactor;
             using (var font = new Font(fontFamily, fontSize, fontStyle, GraphicsUnit.Pixel))
             {
-                e.Graphics.DrawString("abcd", font, SystemBrushes.ActiveCaptionText, e.Bounds);
+                var sf = new StringFormat(StringFormatFlags.NoWrap | StringFormatFlags.NoFontFallback)
+                {
+                    LineAlignment = StringAlignment.Far 
+                };
+                e.Graphics.DrawString("abcd", font, SystemBrushes.ActiveCaptionText, e.Bounds, sf);
             }
         }
     }