diff --git a/app/src/gambas3/.src/Debug/Breakpoints.module b/app/src/gambas3/.src/Debug/Breakpoints.module
index eb4788fb5..b6a3fb06c 100644
--- a/app/src/gambas3/.src/Debug/Breakpoints.module
+++ b/app/src/gambas3/.src/Debug/Breakpoints.module
@@ -6,7 +6,6 @@ Private $cBreakpoints As Collection
 
 Public Sub OnProjectChange()
   
-  
   $cBreakpoints = Project.Config["/Debug/Breakpoints"]
   If Not $cBreakpoints Then $cBreakpoints = New Collection
   
diff --git a/app/src/gambas3/.src/Debug/FDebugInfo.class b/app/src/gambas3/.src/Debug/FDebugInfo.class
index 9beb04118..774c55200 100644
--- a/app/src/gambas3/.src/Debug/FDebugInfo.class
+++ b/app/src/gambas3/.src/Debug/FDebugInfo.class
@@ -1017,8 +1017,10 @@ Public Sub OnProjectChange()
   UpdateTask
   SetCompilation()
   CloseSearch
-  trmVersionControl.Clear
-  trmTest.Clear
+  If Project.Dir <> Project.PreviousDir Then 
+    trmVersionControl.Clear
+    trmTest.Clear
+  Endif
   panTestResult.Hide
   $cTrack = New Collection
   $iLastBreakpointsTimeStamp = 0
diff --git a/app/src/gambas3/.src/Project.module b/app/src/gambas3/.src/Project.module
index c7d04027a..220fa6c0a 100644
--- a/app/src/gambas3/.src/Project.module
+++ b/app/src/gambas3/.src/Project.module
@@ -35,6 +35,7 @@ Public ActiveForm As Object
 Public Path As String
 Public Name As String
 Public Dir As String
+Public PreviousDir As String
 Public SourceDir As String
 Public ReadOnly As Boolean
 
@@ -648,6 +649,8 @@ Public Function Open(sDir As String, Optional bInAnotherWindow As Boolean, sOpen
     
   Endif
 
+  PreviousDir = Project.Dir
+  
   If Not $bTesting Then
     If CloseProject() Then Return True
   Endif