diff --git a/docs/changelog.rst b/docs/changelog.rst
index 6cc62483c..1e4ff572f 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -11,6 +11,10 @@ To update |kitty|, :doc:`follow the instructions <binary>`.
   via escape codes to detect its version, and the values of
   configuration options that enable or disable terminal features.
 
+- Fix a regression in 0.19.0 that caused borders not to be drawn when setting
+  :opt:`window_margin_width` and keeping :opt:`draw_minimal_borders` on
+  (:iss:`3017`)
+
 
 0.19.1 [2020-10-06]
 -------------------
diff --git a/kitty/borders.py b/kitty/borders.py
index ed7eb9e11..1216ecfca 100644
--- a/kitty/borders.py
+++ b/kitty/borders.py
@@ -69,7 +69,7 @@ class Borders:
         self.os_window_id = os_window_id
         self.tab_id = tab_id
         self.draw_active_borders = opts.active_border_color is not None
-        self.draw_minimal_borders = opts.draw_minimal_borders
+        self.draw_minimal_borders = opts.draw_minimal_borders and max(opts.window_margin_width) < 1
 
     def __call__(
         self,