diff --git a/comp/src/gb.form/.project b/comp/src/gb.form/.project
index a7a86e5cc..89bcf88ad 100644
--- a/comp/src/gb.form/.project
+++ b/comp/src/gb.form/.project
@@ -9,7 +9,7 @@ Component=gb.form
 Component=gb.settings
 Component=gb.form.stock
 Authors="Benoît Minisini"
-Environment="GB_GUI=gb.qt5"
+Environment="GB_GUI=gb.qt5\nGB_STOCK_DEBUG=1"
 TabSize=2
 Translate=1
 Language=en
diff --git a/comp/src/gb.form/.src/File/Chooser/FDirChooser.class b/comp/src/gb.form/.src/File/Chooser/FDirChooser.class
index 0129e63ae..98fa83317 100644
--- a/comp/src/gb.form/.src/File/Chooser/FDirChooser.class
+++ b/comp/src/gb.form/.src/File/Chooser/FDirChooser.class
@@ -1502,6 +1502,7 @@ End
 Public Sub SetBorder(bBorder As Boolean)
   
   panBorder.Border = If(bBorder, Border.Plain, Border.None)
+  sepNoBorder.Visible = Not bBorder
   
 End
 
diff --git a/comp/src/gb.form/.src/File/Chooser/FDirChooser.form b/comp/src/gb.form/.src/File/Chooser/FDirChooser.form
index 5902c2b9b..d27de99bd 100644
--- a/comp/src/gb.form/.src/File/Chooser/FDirChooser.form
+++ b/comp/src/gb.form/.src/File/Chooser/FDirChooser.form
@@ -139,8 +139,11 @@
       }
     }
   }
+  { sepNoBorder Separator
+    MoveScaled(39,60,26,0)
+  }
   { panFilter HBox
-    MoveScaled(3,60,84,11)
+    MoveScaled(2,63,84,11)
     Spacing = True
     { panExtension VBox
       MoveScaled(1,1,62,9)
diff --git a/comp/src/gb.form/.src/Test/FTestFileChooser.class b/comp/src/gb.form/.src/Test/FTestFileChooser.class
index 9c6b01023..b071d77a5 100644
--- a/comp/src/gb.form/.src/Test/FTestFileChooser.class
+++ b/comp/src/gb.form/.src/Test/FTestFileChooser.class
@@ -36,7 +36,8 @@ End
 
 Static Public Sub _init()
 
-  Application.Theme = "gambas"
+  'Application.Theme = "gambas"
+  Print Application.Theme
   Component.Load("gb.inotify")
 
 End