diff --git a/qrenderdoc/Windows/ShaderViewer.cpp b/qrenderdoc/Windows/ShaderViewer.cpp
index 854d9bebb..8629e58a2 100644
--- a/qrenderdoc/Windows/ShaderViewer.cpp
+++ b/qrenderdoc/Windows/ShaderViewer.cpp
@@ -290,8 +290,6 @@ void ShaderViewer::debugShader(const ShaderBindpointMapping *bind, const ShaderR
   m_Trace = trace;
   m_Stage = stage;
 
-  m_DisassemblyFrame->layout()->removeWidget(m_DisassemblyToolbar);
-
   // no replacing allowed, stay in find mode
   m_FindReplace->allowUserModeChange(false);
 
@@ -341,6 +339,8 @@ void ShaderViewer::debugShader(const ShaderBindpointMapping *bind, const ShaderR
   {
     m_DisassemblyView->usePopUp(SC_POPUP_NEVER);
 
+    m_DisassemblyFrame->layout()->removeWidget(m_DisassemblyToolbar);
+
     m_DisassemblyView->setContextMenuPolicy(Qt::CustomContextMenu);
     QObject::connect(m_DisassemblyView, &ScintillaEdit::customContextMenuRequested, this,
                      &ShaderViewer::disassembly_contextMenu);