diff --git a/qrenderdoc/Widgets/Extended/RDTreeView.cpp b/qrenderdoc/Widgets/Extended/RDTreeView.cpp
index 93d888352..4a520de5c 100644
--- a/qrenderdoc/Widgets/Extended/RDTreeView.cpp
+++ b/qrenderdoc/Widgets/Extended/RDTreeView.cpp
@@ -131,6 +131,8 @@ RDTreeView::RDTreeView(QWidget *parent) : QTreeView(parent)
 
 RDTreeView::~RDTreeView()
 {
+  setModel(NULL);
+
   delete m_ElidedTooltip;
 }
 
diff --git a/qrenderdoc/Widgets/Extended/RDTreeWidget.cpp b/qrenderdoc/Widgets/Extended/RDTreeWidget.cpp
index a7159fcd0..effbc00b6 100644
--- a/qrenderdoc/Widgets/Extended/RDTreeWidget.cpp
+++ b/qrenderdoc/Widgets/Extended/RDTreeWidget.cpp
@@ -596,6 +596,8 @@ RDTreeWidget::RDTreeWidget(QWidget *parent) : RDTreeView(parent)
 
 RDTreeWidget::~RDTreeWidget()
 {
+  RDTreeView::setModel(NULL);
+
   delete m_root;
   delete m_model;
 }