diff --git a/qrenderdoc/Code/Interface/Extensions.h b/qrenderdoc/Code/Interface/Extensions.h
index a6ae10642..496aa8833 100644
--- a/qrenderdoc/Code/Interface/Extensions.h
+++ b/qrenderdoc/Code/Interface/Extensions.h
@@ -90,6 +90,10 @@ DOCUMENT(R"(Specifies the panel to add a menu item into.
 .. data:: TextureViewer
 
   The :class:`TextureViewer`.
+
+.. data:: BufferViewer
+
+  Any non-mesh previewing :class:`BufferViewer`.
 )");
 enum class PanelMenu
 {
@@ -98,6 +102,7 @@ enum class PanelMenu
   PipelineStateViewer,
   MeshPreview,
   TextureViewer,
+  BufferViewer,
 };
 
 DECLARE_REFLECTION_ENUM(PanelMenu);
diff --git a/qrenderdoc/Windows/BufferViewer.cpp b/qrenderdoc/Windows/BufferViewer.cpp
index 0163df10c..96e8ff36b 100644
--- a/qrenderdoc/Windows/BufferViewer.cpp
+++ b/qrenderdoc/Windows/BufferViewer.cpp
@@ -2309,7 +2309,8 @@ BufferViewer::BufferViewer(ICaptureContext &ctx, bool meshview, QWidget *parent)
 
     QObject::connect(extensionsMenu, &QMenu::aboutToShow, [this, extensionsMenu]() {
       extensionsMenu->clear();
-      m_Ctx.Extensions().MenuDisplaying(PanelMenu::MeshPreview, extensionsMenu, ui->extensions, {});
+      m_Ctx.Extensions().MenuDisplaying(m_MeshView ? PanelMenu::MeshPreview : PanelMenu::BufferViewer,
+                                        extensionsMenu, ui->extensions, {});
     });
   }