diff --git a/eeschema/sch_edit_frame.cpp b/eeschema/sch_edit_frame.cpp
index 45ab2015bc..cfe3996f1f 100644
--- a/eeschema/sch_edit_frame.cpp
+++ b/eeschema/sch_edit_frame.cpp
@@ -471,8 +471,9 @@ SCH_EDIT_FRAME::~SCH_EDIT_FRAME()
         }
     }
 
-    delete m_hierarchy;
-    delete m_selectionFilterPanel;
+    // We passed ownership of these to wxAuiManager.
+    // delete m_hierarchy;
+    // delete m_selectionFilterPanel;
 }
 
 
diff --git a/pcbnew/footprint_edit_frame.cpp b/pcbnew/footprint_edit_frame.cpp
index 96cb2273ba..83503f1854 100644
--- a/pcbnew/footprint_edit_frame.cpp
+++ b/pcbnew/footprint_edit_frame.cpp
@@ -341,9 +341,10 @@ FOOTPRINT_EDIT_FRAME::~FOOTPRINT_EDIT_FRAME()
     // Clear the watched file
     setFPWatcher( nullptr );
 
-    delete m_selectionFilterPanel;
-    delete m_appearancePanel;
-    delete m_treePane;
+    // We passed ownership of these to wxAuiManager.
+    // delete m_selectionFilterPanel;
+    // delete m_appearancePanel;
+    // delete m_treePane;
 }
 
 
diff --git a/pcbnew/pcb_edit_frame.cpp b/pcbnew/pcb_edit_frame.cpp
index 1252b96fc8..61e8a845b5 100644
--- a/pcbnew/pcb_edit_frame.cpp
+++ b/pcbnew/pcb_edit_frame.cpp
@@ -599,11 +599,13 @@ PCB_EDIT_FRAME::~PCB_EDIT_FRAME()
     if( GetBoard() )
         GetBoard()->RemoveAllListeners();
 
-    delete m_selectionFilterPanel;
-    delete m_appearancePanel;
+    // We passed ownership of these to wxAuiManager.
+    // delete m_selectionFilterPanel;
+    // delete m_appearancePanel;
+    // delete m_propertiesPanel;
+    // delete m_netInspectorPanel;
+
     delete m_exportNetlistAction;
-    delete m_propertiesPanel;
-    delete m_netInspectorPanel;
 }