diff --git a/3d-viewer/3d_canvas/eda_3d_canvas.h b/3d-viewer/3d_canvas/eda_3d_canvas.h
index 76819f8588..67caacd783 100644
--- a/3d-viewer/3d_canvas/eda_3d_canvas.h
+++ b/3d-viewer/3d_canvas/eda_3d_canvas.h
@@ -216,6 +216,8 @@ public:
      */
     void DoRePaint();
 
+    void OnCloseWindow( wxCloseEvent& event );
+
 private:
     // The wxPaintEvent event. mainly calls DoRePaint()
     void OnPaint( wxPaintEvent& aEvent );
@@ -226,14 +228,13 @@ private:
 
     void OnMouseWheel( wxMouseEvent& event );
 
-    void   OnMagnify( wxMouseEvent& event );
+    void OnMagnify( wxMouseEvent& event );
     void OnMouseMove( wxMouseEvent& event );
     void OnLeftDown( wxMouseEvent& event );
     void OnLeftUp( wxMouseEvent& event );
     void OnMiddleUp( wxMouseEvent& event );
     void OnMiddleDown( wxMouseEvent& event );
     void OnTimerTimeout_Editing( wxTimerEvent& event );
-    void OnCloseWindow( wxCloseEvent& event );
     void OnResize( wxSizeEvent& event );
     void OnTimerTimeout_Redraw( wxTimerEvent& event );
 
diff --git a/pcbnew/dialogs/dialog_footprint_chooser.cpp b/pcbnew/dialogs/dialog_footprint_chooser.cpp
index d9c4150777..ded6107a84 100644
--- a/pcbnew/dialogs/dialog_footprint_chooser.cpp
+++ b/pcbnew/dialogs/dialog_footprint_chooser.cpp
@@ -62,12 +62,12 @@ DIALOG_FOOTPRINT_CHOOSER::DIALOG_FOOTPRINT_CHOOSER( PCB_BASE_FRAME* aParent,
             // Accept handler
             [this]()
             {
-                EndModal( wxID_OK );
+                EndQuasiModal( wxID_OK );
             },
             // Escape handler
             [this]()
             {
-                EndModal( wxID_CANCEL );
+                EndQuasiModal( wxID_CANCEL );
             } );
 
     m_SizerTop->Add( m_chooserPanel, 1, wxEXPAND | wxRIGHT, 5 );
@@ -292,4 +292,12 @@ void DIALOG_FOOTPRINT_CHOOSER::TearDownQuasiModal()
             }
         }
     }
+
+    if( m_preview3DCanvas )
+    {
+        // Work around assertion firing when we try to LockCtx on a hidden 3D canvas during dtor
+        wxCloseEvent dummy;
+        m_preview3DCanvas->Show();
+        m_preview3DCanvas->OnCloseWindow( dummy );
+    }
 }
diff --git a/pcbnew/footprint_chooser_frame.cpp b/pcbnew/footprint_chooser_frame.cpp
index e6a7c65ed2..9eb1c67b73 100644
--- a/pcbnew/footprint_chooser_frame.cpp
+++ b/pcbnew/footprint_chooser_frame.cpp
@@ -213,6 +213,11 @@ FOOTPRINT_CHOOSER_FRAME::FOOTPRINT_CHOOSER_FRAME( KIWAY* aKiway, wxWindow* aPare
 
 FOOTPRINT_CHOOSER_FRAME::~FOOTPRINT_CHOOSER_FRAME()
 {
+    // Work around assertion firing when we try to LockCtx on a hidden 3D canvas during dtor
+    wxCloseEvent dummy;
+    m_preview3DCanvas->Show();
+    m_preview3DCanvas->OnCloseWindow( dummy );
+
     // Disconnect Events
     m_grButton3DView->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED,
                             wxCommandEventHandler( FOOTPRINT_CHOOSER_FRAME::on3DviewReq ), NULL, this );