diff --git a/pcbnew/files.cpp b/pcbnew/files.cpp
index d151b9534c..0526b66823 100644
--- a/pcbnew/files.cpp
+++ b/pcbnew/files.cpp
@@ -418,7 +418,7 @@ bool PCB_EDIT_FRAME::OpenProjectFiles( const std::vector<wxString>& aFileSet, in
     }
 
     // Release the lock file, until the new file is actually loaded
-    m_file_checker.reset( nullptr );
+    ReleaseFile();
 
     wxFileName pro = fullFileName;
     pro.SetExt( ProjectFileExtension );
diff --git a/pcbnew/initpcb.cpp b/pcbnew/initpcb.cpp
index c1cd1b8274..d0c64bb7dc 100644
--- a/pcbnew/initpcb.cpp
+++ b/pcbnew/initpcb.cpp
@@ -48,6 +48,9 @@ bool PCB_EDIT_FRAME::Clear_Pcb( bool aQuery )
             return false;
     }
 
+    // Release the lock file, if exists
+    ReleaseFile();
+
     // Clear undo and redo lists because we want a full deletion
     GetScreen()->ClearUndoRedoList();
     GetScreen()->ClrModify();