diff --git a/app/src/gambas3/.src/Project/ArgListBox.class b/app/src/gambas3/.src/Project/ArgListBox.class
index 1a641784c..46084f011 100644
--- a/app/src/gambas3/.src/Project/ArgListBox.class
+++ b/app/src/gambas3/.src/Project/ArgListBox.class
@@ -23,7 +23,7 @@ End
 
 Private Sub AutoResize()
 
-  Me.Resize(Me.Font.TextWidth($hTextBox.Text) + Desktop.Scale * 2, Desktop.Scale * 3)
+  Me.Resize(Me.Font.TextWidth($hTextBox.Text) + Desktop.Scale + 2, Desktop.Scale * 3)
   $hTextBox.Move(1, 1, Me.W - 2, Me.H - 2)
 
 End
diff --git a/app/src/gambas3/.src/Project/ArgListEditor.class b/app/src/gambas3/.src/Project/ArgListEditor.class
index 03faaac4e..7c8bf655b 100644
--- a/app/src/gambas3/.src/Project/ArgListEditor.class
+++ b/app/src/gambas3/.src/Project/ArgListEditor.class
@@ -10,6 +10,7 @@ Property Selected As Boolean
 
 Private $hPanel As DrawingArea
 Private $bSelected As Boolean
+Private $bNoResizePanel As Boolean
 
 Public Sub _new()
   
@@ -41,6 +42,8 @@ Public Sub Set(aArg As String[])
   
   $hPanel.Children.Clear
   
+  $bNoResizePanel = True
+  
   If aArg Then
     For Each sArg In aArg
       Add(sArg)
@@ -49,6 +52,8 @@ Public Sub Set(aArg As String[])
   
   Add()
   
+  $bNoResizePanel = False
+  
   ResizePanel
   
 End
@@ -78,12 +83,15 @@ Private Sub ResizePanel()
   
   Dim H As Integer
   
+  If $bNoResizePanel Then Return
+  
   With $hPanel.Children[$hPanel.Children.Count - 1]
     H = .Y + .H + Desktop.Scale
   End With
   
   H = Max(H, Desktop.Scale * 5)
   
+  $hPanel.H = H
   Me.H = H
   
 End
diff --git a/app/src/gambas3/.src/Project/FProjectProperty.form b/app/src/gambas3/.src/Project/FProjectProperty.form
index b4bc84b9e..c1b113b99 100644
--- a/app/src/gambas3/.src/Project/FProjectProperty.form
+++ b/app/src/gambas3/.src/Project/FProjectProperty.form
@@ -491,14 +491,21 @@
     }
     Index = 5
     Text = ("Arguments")
-    { svwArgList ScrollView
-      MoveScaled(2,1,80,40)
-      Background = Color.TextBackground
+    { Panel8 Panel
+      MoveScaled(2,1,83,43)
       Expand = True
-      Arrangement = Arrange.Vertical
-      Spacing = True
-      Margin = True
-      ScrollBar = Scroll.Vertical
+      Arrangement = Arrange.Fill
+      Border = Border.Plain
+      { svwArgList ScrollView
+        MoveScaled(1,1,80,40)
+        Background = Color.TextBackground
+        Expand = True
+        Arrangement = Arrange.Vertical
+        Spacing = True
+        Margin = True
+        Border = False
+        ScrollBar = Scroll.Vertical
+      }
     }
     { HBox2 HBox
       MoveScaled(3,47,77,4)