diff --git a/docs/changelog.rst b/docs/changelog.rst
index f4a6630b3..72f6f324f 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -88,6 +88,8 @@ Detailed list of changes
 
 - When mapping a custom kitten allow using shell escaping for the kitten path (:iss:`8178`)
 
+- Fix border colors not being changed by auto light/dark themes at startup (:iss:`8180`)
+
 0.38.1 [2024-12-26]
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
diff --git a/kitty/colors.py b/kitty/colors.py
index 7c57884c3..a4e4c78a5 100644
--- a/kitty/colors.py
+++ b/kitty/colors.py
@@ -103,16 +103,19 @@ class ThemeColors:
             log_error('Current system color scheme:', which)
         if which == 'dark' and self.has_dark_theme:
             patch_options_with_color_spec(opts, self.dark_spec, self.dark_tbc)
+            patch_global_colors(self.dark_spec, True)
             if debug_rendering:
                 log_error(f'Applied {which} color theme')
             self.applied_theme = which
         elif which == 'light' and self.has_light_theme:
             patch_options_with_color_spec(opts, self.light_spec, self.light_tbc)
+            patch_global_colors(self.dark_spec, True)
             if debug_rendering:
                 log_error(f'Applied {which} color theme')
             self.applied_theme = which
         elif which == 'no_preference' and self.has_no_preference_theme:
             patch_options_with_color_spec(opts, self.no_preference_spec, self.no_preference_tbc)
+            patch_global_colors(self.dark_spec, True)
             if debug_rendering:
                 log_error(f'Applied {which} color theme')
             self.applied_theme = which