diff --git a/app/src/gambas3/.src/Exported/ProjectChooser/FProjectChooser.class b/app/src/gambas3/.src/Exported/ProjectChooser/FProjectChooser.class
index f9af0dfe0..2c5eec5ff 100644
--- a/app/src/gambas3/.src/Exported/ProjectChooser/FProjectChooser.class
+++ b/app/src/gambas3/.src/Exported/ProjectChooser/FProjectChooser.class
@@ -84,6 +84,7 @@ Public Sub dchProject_Change()
     
     panProject.Show
     dchProject.FileView.Hide
+    
     dchProject.ShowToolbar = False
     
   Endif
diff --git a/app/src/gambas3/.src/Project/CProjectTree.class b/app/src/gambas3/.src/Project/CProjectTree.class
index 5618c66bf..faab757dd 100644
--- a/app/src/gambas3/.src/Project/CProjectTree.class
+++ b/app/src/gambas3/.src/Project/CProjectTree.class
@@ -466,6 +466,7 @@ Public Sub CheckDuplicates() As String[]
   
   For Each sPath In RDir($sSourceDir, "*", gb.File, True)
     sName = File.Name(sPath)
+    If sName Ends "~" Then Continue
     sDup = cName[sName]
     If Not sDup Then
       cName[sName] = sPath
diff --git a/app/src/gambas3/.src/Project/FMakeExecutable.class b/app/src/gambas3/.src/Project/FMakeExecutable.class
index 9481bdfad..9334a065b 100644
--- a/app/src/gambas3/.src/Project/FMakeExecutable.class
+++ b/app/src/gambas3/.src/Project/FMakeExecutable.class
@@ -24,6 +24,7 @@ Public Sub Form_Open()
   chkIncVersion.Value = Not Project.Config["/Executable/DoNotIncrementVersion", False]
   chkIncVersion.Visible = Not Project.VersionFile
 
+  chkNoTest.Visible = Project.HasTest()
   chkNoTest.Value = Project.Config["/Executable/NoTestModule", False]
 
   ' If Project.CreateComponent Then