diff --git a/pcbnew/pcb_base_edit_frame.cpp b/pcbnew/pcb_base_edit_frame.cpp
index 1faa9de9c7..003098889e 100644
--- a/pcbnew/pcb_base_edit_frame.cpp
+++ b/pcbnew/pcb_base_edit_frame.cpp
@@ -50,6 +50,8 @@ PCB_BASE_EDIT_FRAME::~PCB_BASE_EDIT_FRAME()
 {
     wxTextFile footprintInfoCache( Prj().GetProjectPath() + "fp-info-cache" );
     GFootprintList.WriteCacheToFile( &footprintInfoCache );
+
+    GetCanvas()->GetView()->Clear();
 }