diff --git a/src/app/ui/color_selector.cpp b/src/app/ui/color_selector.cpp
index fd2c2965b..3356d6bfc 100644
--- a/src/app/ui/color_selector.cpp
+++ b/src/app/ui/color_selector.cpp
@@ -383,8 +383,10 @@ bool ColorSelector::onProcessMessage(ui::Message* msg)
 
 void ColorSelector::onInitTheme(ui::InitThemeEvent& ev)
 {
+  SkinTheme* theme = static_cast<SkinTheme*>(this->theme());
+
   Widget::onInitTheme(ev);
-  setBorder(gfx::Border(3*ui::guiscale()));
+  setBorder(theme->calcBorder(this, theme->styles.editorView()));
 }
 
 void ColorSelector::onResize(ui::ResizeEvent& ev)