diff --git a/qrenderdoc/Code/CaptureContext.cpp b/qrenderdoc/Code/CaptureContext.cpp
index 07c030e12..b07a123f9 100644
--- a/qrenderdoc/Code/CaptureContext.cpp
+++ b/qrenderdoc/Code/CaptureContext.cpp
@@ -775,25 +775,24 @@ void CaptureContext::ShowStatisticsViewer()
 IShaderViewer *CaptureContext::EditShader(bool customShader, const QString &entryPoint,
                                           const QStringMap &files,
                                           IShaderViewer::SaveCallback saveCallback,
-                                          IShaderViewer::CloseCallback closeCallback, QWidget *parent)
+                                          IShaderViewer::CloseCallback closeCallback)
 {
   return ShaderViewer::EditShader(*this, customShader, entryPoint, files, saveCallback,
-                                  closeCallback, parent);
+                                  closeCallback, m_MainWindow->Widget());
 }
 
 IShaderViewer *CaptureContext::DebugShader(const ShaderBindpointMapping *bind,
                                            const ShaderReflection *shader, ShaderStage stage,
-                                           ShaderDebugTrace *trace, const QString &debugContext,
-                                           QWidget *parent)
+                                           ShaderDebugTrace *trace, const QString &debugContext)
 {
-  return ShaderViewer::DebugShader(*this, bind, shader, stage, trace, debugContext, parent);
+  return ShaderViewer::DebugShader(*this, bind, shader, stage, trace, debugContext,
+                                   m_MainWindow->Widget());
 }
 
 IShaderViewer *CaptureContext::ViewShader(const ShaderBindpointMapping *bind,
-                                          const ShaderReflection *shader, ShaderStage stage,
-                                          QWidget *parent)
+                                          const ShaderReflection *shader, ShaderStage stage)
 {
-  return ShaderViewer::ViewShader(*this, bind, shader, stage, parent);
+  return ShaderViewer::ViewShader(*this, bind, shader, stage, m_MainWindow->Widget());
 }
 
 IBufferViewer *CaptureContext::ViewBuffer(uint64_t byteOffset, uint64_t byteSize, ResourceId id,
diff --git a/qrenderdoc/Code/CaptureContext.h b/qrenderdoc/Code/CaptureContext.h
index 628e07d08..4ded8ae3c 100644
--- a/qrenderdoc/Code/CaptureContext.h
+++ b/qrenderdoc/Code/CaptureContext.h
@@ -148,14 +148,14 @@ public:
 
   IShaderViewer *EditShader(bool customShader, const QString &entryPoint, const QStringMap &files,
                             IShaderViewer::SaveCallback saveCallback,
-                            IShaderViewer::CloseCallback closeCallback, QWidget *parent) override;
+                            IShaderViewer::CloseCallback closeCallback) override;
 
   IShaderViewer *DebugShader(const ShaderBindpointMapping *bind, const ShaderReflection *shader,
                              ShaderStage stage, ShaderDebugTrace *trace,
-                             const QString &debugContext, QWidget *parent) override;
+                             const QString &debugContext) override;
 
   IShaderViewer *ViewShader(const ShaderBindpointMapping *bind, const ShaderReflection *shader,
-                            ShaderStage stage, QWidget *parent) override;
+                            ShaderStage stage) override;
 
   IBufferViewer *ViewBuffer(uint64_t byteOffset, uint64_t byteSize, ResourceId id,
                             const QString &format = "") override;
diff --git a/qrenderdoc/Code/Interface/QRDInterface.h b/qrenderdoc/Code/Interface/QRDInterface.h
index 675b7c08b..db36d4890 100644
--- a/qrenderdoc/Code/Interface/QRDInterface.h
+++ b/qrenderdoc/Code/Interface/QRDInterface.h
@@ -392,17 +392,14 @@ struct ICaptureContext
 
   virtual IShaderViewer *EditShader(bool customShader, const QString &entryPoint,
                                     const QStringMap &files, IShaderViewer::SaveCallback saveCallback,
-                                    IShaderViewer::CloseCallback closeCallback, QWidget *parent) = 0;
-
+                                    IShaderViewer::CloseCallback closeCallback) = 0;
   virtual IShaderViewer *DebugShader(const ShaderBindpointMapping *bind,
                                      const ShaderReflection *shader, ShaderStage stage,
-                                     ShaderDebugTrace *trace, const QString &debugContext,
-                                     QWidget *parent) = 0;
+                                     ShaderDebugTrace *trace, const QString &debugContext) = 0;
+
 
   virtual IShaderViewer *ViewShader(const ShaderBindpointMapping *bind,
-                                    const ShaderReflection *shader, ShaderStage stage,
-                                    QWidget *parent) = 0;
-
+                                    const ShaderReflection *shader, ShaderStage stage) = 0;
   virtual IBufferViewer *ViewBuffer(uint64_t byteOffset, uint64_t byteSize, ResourceId id,
                                     const QString &format = "") = 0;
   virtual IBufferViewer *ViewTextureAsBuffer(uint32_t arrayIdx, uint32_t mip, ResourceId id,
diff --git a/qrenderdoc/Windows/BufferViewer.cpp b/qrenderdoc/Windows/BufferViewer.cpp
index c230d1e22..1d3a7315e 100644
--- a/qrenderdoc/Windows/BufferViewer.cpp
+++ b/qrenderdoc/Windows/BufferViewer.cpp
@@ -2763,8 +2763,8 @@ void BufferViewer::debugVertex()
           m_Ctx.CurPipelineState().GetBindpointMapping(ShaderStage::Pixel);
 
       // viewer takes ownership of the trace
-      IShaderViewer *s = m_Ctx.DebugShader(&bindMapping, shaderDetails, ShaderStage::Pixel, trace,
-                                           debugContext, this);
+      IShaderViewer *s =
+          m_Ctx.DebugShader(&bindMapping, shaderDetails, ShaderStage::Pixel, trace, debugContext);
 
       m_Ctx.AddDockWindow(s->Widget(), DockReference::AddTo, this);
     });
diff --git a/qrenderdoc/Windows/PipelineState/D3D11PipelineStateViewer.cpp b/qrenderdoc/Windows/PipelineState/D3D11PipelineStateViewer.cpp
index 191d73b80..f877606b7 100644
--- a/qrenderdoc/Windows/PipelineState/D3D11PipelineStateViewer.cpp
+++ b/qrenderdoc/Windows/PipelineState/D3D11PipelineStateViewer.cpp
@@ -2160,8 +2160,7 @@ void D3D11PipelineStateViewer::shaderView_clicked()
     shaderStage = stage->stage;
   }
 
-  IShaderViewer *shad =
-      m_Ctx.ViewShader(bindMap, shaderDetails, shaderStage, m_Ctx.GetMainWindow()->Widget());
+  IShaderViewer *shad = m_Ctx.ViewShader(bindMap, shaderDetails, shaderStage);
 
   m_Ctx.AddDockWindow(shad->Widget(), DockReference::AddTo, this);
 }
diff --git a/qrenderdoc/Windows/PipelineState/D3D12PipelineStateViewer.cpp b/qrenderdoc/Windows/PipelineState/D3D12PipelineStateViewer.cpp
index 140550cd8..83bbb2cef 100644
--- a/qrenderdoc/Windows/PipelineState/D3D12PipelineStateViewer.cpp
+++ b/qrenderdoc/Windows/PipelineState/D3D12PipelineStateViewer.cpp
@@ -2104,8 +2104,8 @@ void D3D12PipelineStateViewer::shaderView_clicked()
   if(stage == NULL || stage->Object == ResourceId())
     return;
 
-  IShaderViewer *shad = m_Ctx.ViewShader(&stage->BindpointMapping, stage->ShaderDetails,
-                                         stage->stage, m_Ctx.GetMainWindow()->Widget());
+  IShaderViewer *shad =
+      m_Ctx.ViewShader(&stage->BindpointMapping, stage->ShaderDetails, stage->stage);
 
   m_Ctx.AddDockWindow(shad->Widget(), DockReference::AddTo, this);
 }
diff --git a/qrenderdoc/Windows/PipelineState/GLPipelineStateViewer.cpp b/qrenderdoc/Windows/PipelineState/GLPipelineStateViewer.cpp
index 592922a9e..0472367c0 100644
--- a/qrenderdoc/Windows/PipelineState/GLPipelineStateViewer.cpp
+++ b/qrenderdoc/Windows/PipelineState/GLPipelineStateViewer.cpp
@@ -2214,8 +2214,7 @@ void GLPipelineStateViewer::shaderView_clicked()
 
   ShaderReflection *shaderDetails = stage->ShaderDetails;
 
-  IShaderViewer *shad = m_Ctx.ViewShader(&stage->BindpointMapping, shaderDetails, stage->stage,
-                                         m_Ctx.GetMainWindow()->Widget());
+  IShaderViewer *shad = m_Ctx.ViewShader(&stage->BindpointMapping, shaderDetails, stage->stage);
 
   m_Ctx.AddDockWindow(shad->Widget(), DockReference::AddTo, this);
 }
diff --git a/qrenderdoc/Windows/PipelineState/PipelineStateViewer.cpp b/qrenderdoc/Windows/PipelineState/PipelineStateViewer.cpp
index fb5cdaa5d..52493b203 100644
--- a/qrenderdoc/Windows/PipelineState/PipelineStateViewer.cpp
+++ b/qrenderdoc/Windows/PipelineState/PipelineStateViewer.cpp
@@ -358,8 +358,7 @@ void PipelineStateViewer::EditShader(ShaderStage shaderType, ResourceId id,
           r->RemoveReplacement(id);
           GUIInvoke::call([ctx] { ctx->RefreshStatus(); });
         });
-      },
-      m_Ctx.GetMainWindow()->Widget());
+      });
 
   m_Ctx.AddDockWindow(sv->Widget(), DockReference::AddTo, this);
 }
diff --git a/qrenderdoc/Windows/PipelineState/VulkanPipelineStateViewer.cpp b/qrenderdoc/Windows/PipelineState/VulkanPipelineStateViewer.cpp
index c7e74b7a5..3f25254f6 100644
--- a/qrenderdoc/Windows/PipelineState/VulkanPipelineStateViewer.cpp
+++ b/qrenderdoc/Windows/PipelineState/VulkanPipelineStateViewer.cpp
@@ -2283,8 +2283,7 @@ void VulkanPipelineStateViewer::shaderView_clicked()
 
   ShaderReflection *shaderDetails = stage->ShaderDetails;
 
-  IShaderViewer *shad = m_Ctx.ViewShader(&stage->BindpointMapping, shaderDetails, stage->stage,
-                                         m_Ctx.GetMainWindow()->Widget());
+  IShaderViewer *shad = m_Ctx.ViewShader(&stage->BindpointMapping, shaderDetails, stage->stage);
 
   m_Ctx.AddDockWindow(shad->Widget(), DockReference::AddTo, this);
 }
diff --git a/qrenderdoc/Windows/PixelHistoryView.cpp b/qrenderdoc/Windows/PixelHistoryView.cpp
index c3bbfe339..edd63393c 100644
--- a/qrenderdoc/Windows/PixelHistoryView.cpp
+++ b/qrenderdoc/Windows/PixelHistoryView.cpp
@@ -659,8 +659,8 @@ void PixelHistoryView::startDebug(EventTag tag)
         m_Ctx.CurPipelineState().GetBindpointMapping(ShaderStage::Pixel);
 
     // viewer takes ownership of the trace
-    IShaderViewer *s = m_Ctx.DebugShader(&bindMapping, shaderDetails, ShaderStage::Pixel, trace,
-                                         debugContext, m_Ctx.GetMainWindow()->Widget());
+    IShaderViewer *s =
+        m_Ctx.DebugShader(&bindMapping, shaderDetails, ShaderStage::Pixel, trace, debugContext);
 
     m_Ctx.AddDockWindow(s->Widget(), DockReference::AddTo, m_Ctx.GetMainWindow()->Widget());
   });
diff --git a/qrenderdoc/Windows/TextureViewer.cpp b/qrenderdoc/Windows/TextureViewer.cpp
index 7531f3d8b..e9c8f39ab 100644
--- a/qrenderdoc/Windows/TextureViewer.cpp
+++ b/qrenderdoc/Windows/TextureViewer.cpp
@@ -3300,8 +3300,8 @@ void TextureViewer::on_debugPixelContext_clicked()
           m_Ctx.CurPipelineState().GetBindpointMapping(ShaderStage::Pixel);
 
       // viewer takes ownership of the trace
-      IShaderViewer *s = m_Ctx.DebugShader(&bindMapping, shaderDetails, ShaderStage::Pixel, trace,
-                                           debugContext, this);
+      IShaderViewer *s =
+          m_Ctx.DebugShader(&bindMapping, shaderDetails, ShaderStage::Pixel, trace, debugContext);
 
       m_Ctx.AddDockWindow(s->Widget(), DockReference::AddTo, this);
     });
@@ -3619,8 +3619,7 @@ void TextureViewer::on_customEdit_clicked()
         }
       },
 
-      [this, key](ICaptureContext *ctx) { m_CustomShaderEditor.remove(key); },
-      m_Ctx.GetMainWindow()->Widget());
+      [this, key](ICaptureContext *ctx) { m_CustomShaderEditor.remove(key); });
 
   m_CustomShaderEditor[key] = s;