diff --git a/qrenderdoc/Windows/TextureViewer.cpp b/qrenderdoc/Windows/TextureViewer.cpp
index 73a2d31d1..df49d7afe 100644
--- a/qrenderdoc/Windows/TextureViewer.cpp
+++ b/qrenderdoc/Windows/TextureViewer.cpp
@@ -3006,7 +3006,7 @@ void TextureViewer::Reset()
 
 void TextureViewer::refreshTextureList()
 {
-  refreshTextureList(FilterType::None, QString());
+  on_textureListFilter_currentIndexChanged(ui->textureListFilter->currentIndex());
 }
 
 void addToRoot(RDTreeWidgetItem *root, const TextureDescription &t)
@@ -3108,7 +3108,12 @@ void TextureViewer::OnEventChanged(uint32_t eventId)
   UI_CreateThumbnails();
 
   UI_UpdateTextureDetails();
-  refreshTextureList();
+
+  if(m_ResourceCacheID != m_Ctx.ResourceNameCacheID())
+  {
+    m_ResourceCacheID = m_Ctx.ResourceNameCacheID();
+    refreshTextureList();
+  }
 
   // iterate over locked tabs, and update the name if it's changed
   for(QWidget *w : m_LockedTabs.values())
diff --git a/qrenderdoc/Windows/TextureViewer.h b/qrenderdoc/Windows/TextureViewer.h
index 68a81141d..085b2c199 100644
--- a/qrenderdoc/Windows/TextureViewer.h
+++ b/qrenderdoc/Windows/TextureViewer.h
@@ -339,6 +339,7 @@ private:
 
   ResourceId m_LockedId;
   QMap<ResourceId, QWidget *> m_LockedTabs;
+  int m_ResourceCacheID = -1;
 
   TextureGoto *m_Goto;