diff --git a/app/src/gambas3/.src/Dialog/FFontChooser.class b/app/src/gambas3/.src/Dialog/FFontChooser.class
index 501f6792c..f60e233b8 100644
--- a/app/src/gambas3/.src/Dialog/FFontChooser.class
+++ b/app/src/gambas3/.src/Dialog/FFontChooser.class
@@ -31,7 +31,6 @@ Public Sub Form_Open()
 
   dlgFont.FixedOnly = $bShowFixed
   dlgFont.SelectedFont = $sFont
-  dlgFont.SetFocus
 
 End
 
@@ -40,3 +39,9 @@ Public Sub dlgFont_Activate()
   btnOK.Value = True
 
 End
+
+Public Sub Form_Activate()
+
+  dlgFont.SetFocus
+
+End
diff --git a/app/src/gambas3/img/control/frame.png b/app/src/gambas3/img/control/frame.png
index 27af2ab3d..a9664e69a 100644
Binary files a/app/src/gambas3/img/control/frame.png and b/app/src/gambas3/img/control/frame.png differ