diff --git a/harbour/contrib/hgf/tests/testctrl.prg b/harbour/contrib/hgf/tests/testctrl.prg
index 81638abc90..86fb5a29cc 100644
--- a/harbour/contrib/hgf/tests/testctrl.prg
+++ b/harbour/contrib/hgf/tests/testctrl.prg
@@ -8,7 +8,7 @@
 function Main()
 
    local oForm := HBFormControls():New()
-   local oBtn
+   local oEdit, oBtn
 
    oForm:Caption = "Harbour GUI Framework controls"
    oForm:Top     = 175
@@ -16,10 +16,17 @@ function Main()
    oForm:Width   = 382
    oForm:Height  = 249
 
+   oEdit = HBEdit():New( oForm )
+   oEdit:Top     = 30
+   oEdit:Left    = 100
+   oEdit:Width   = 200
+   oEdit:Caption = "Edit control"
+   oForm:InsertControl( oEdit )
+
    oBtn = HBButton():New( oForm )
    oBtn:Caption = "&View as text"
-   oBtn:Top     = 50
-   oBtn:Left    = 120
+   oBtn:Top     = 150
+   oBtn:Left    = 10
    oBtn:Width   = 100
    oBtn:OnClick = "BtnViewAsTextClick"
    oForm:InsertControl( oBtn )
@@ -27,14 +34,14 @@ function Main()
    oBtn = HBButton():New( oForm )
    oBtn:Caption = "&Ok"
    oBtn:Top     = 150
-   oBtn:Left    = 70
+   oBtn:Left    = 180
    oBtn:OnClick = "BtnOkClick"
    oForm:InsertControl( oBtn )
 
    oBtn = HBButton():New( oForm )
    oBtn:Caption = "&Cancel"
    oBtn:Top     = 150
-   oBtn:Left    = 200
+   oBtn:Left    = 280
    oBtn:OnClick = "BtnCancelClick"
    oForm:InsertControl( oBtn )