diff --git a/Source/NSButtonCell.m b/Source/NSButtonCell.m
index 042543866..fed903898 100644
--- a/Source/NSButtonCell.m
+++ b/Source/NSButtonCell.m
@@ -964,6 +964,10 @@
     {
       borderSize.height += 1;
       borderSize.width  += 3;
+
+      /* Add some more space because it looks better.  */
+      borderSize.height += 2;
+      borderSize.width  += 3;
     }
   
   // Add border size