diff --git a/qrenderdoc/Windows/PythonShell.cpp b/qrenderdoc/Windows/PythonShell.cpp
index ba9e55565..86901d44e 100644
--- a/qrenderdoc/Windows/PythonShell.cpp
+++ b/qrenderdoc/Windows/PythonShell.cpp
@@ -462,10 +462,10 @@ PythonShell::PythonShell(ICaptureContext &ctx, QWidget *parent)
   scriptEditor->styleSetFont(
       STYLE_DEFAULT, QFontDatabase::systemFont(QFontDatabase::FixedFont).family().toUtf8().data());
 
-  scriptEditor->setMarginLeft(4);
-  scriptEditor->setMarginWidthN(0, 32);
+  scriptEditor->setMarginLeft(4.0 * devicePixelRatioF());
+  scriptEditor->setMarginWidthN(0, 32.0 * devicePixelRatioF());
   scriptEditor->setMarginWidthN(1, 0);
-  scriptEditor->setMarginWidthN(2, 16);
+  scriptEditor->setMarginWidthN(2, 16.0 * devicePixelRatioF());
   scriptEditor->setObjectName(lit("scriptEditor"));
 
   scriptEditor->markerSetBack(CURRENT_MARKER, SCINTILLA_COLOUR(240, 128, 128));
diff --git a/qrenderdoc/Windows/ShaderViewer.cpp b/qrenderdoc/Windows/ShaderViewer.cpp
index 4714d8a98..ce6d710ec 100644
--- a/qrenderdoc/Windows/ShaderViewer.cpp
+++ b/qrenderdoc/Windows/ShaderViewer.cpp
@@ -446,7 +446,7 @@ void ShaderViewer::debugShader(const ShaderBindpointMapping *bind, const ShaderR
     ui->docking->setToolWindowProperties(
         ui->constants, ToolWindowManager::HideCloseButton | ToolWindowManager::DisallowFloatWindow);
 
-    m_DisassemblyView->setMarginWidthN(1, 20);
+    m_DisassemblyView->setMarginWidthN(1, 20.0 * devicePixelRatioF());
 
     // display current line in margin 2, distinct from breakpoint in margin 1
     sptr_t markMask = (1 << CURRENT_MARKER) | (1 << FINISHED_MARKER);
@@ -678,10 +678,12 @@ ScintillaEdit *ShaderViewer::MakeEditor(const QString &name, const QString &text
   if(numlines > 10000)
     margin0width += 6;
 
-  ret->setMarginLeft(4);
+  margin0width = int(margin0width * devicePixelRatioF());
+
+  ret->setMarginLeft(4.0 * devicePixelRatioF());
   ret->setMarginWidthN(0, margin0width);
   ret->setMarginWidthN(1, 0);
-  ret->setMarginWidthN(2, 16);
+  ret->setMarginWidthN(2, 16.0 * devicePixelRatioF());
   ret->setObjectName(name);
 
   ret->styleSetFont(STYLE_DEFAULT,