diff --git a/colors/reeder.kak b/colors/reeder.kak
index 4acff1d2..02095e59 100644
--- a/colors/reeder.kak
+++ b/colors/reeder.kak
@@ -64,6 +64,6 @@
         face StatusCursor       ${orange},${white_light}
         face Prompt             ${black_light}
         face MatchingChar       default+b
-        face BufferPadding		${grey_dark},${white}
+        face BufferPadding      ${grey_dark},${white}
     "
 }
diff --git a/colors/solarized.kak b/colors/solarized.kak
index a1e9b1db..01404e8a 100644
--- a/colors/solarized.kak
+++ b/colors/solarized.kak
@@ -64,6 +64,6 @@
         face StatusCursor       ${base00},${base3}
         face Prompt             yellow
         face MatchingChar       default+b
-        face BufferPadding		${base01},${base03}
+        face BufferPadding      ${base01},${base03}
     "
 }
diff --git a/src/face_registry.cc b/src/face_registry.cc
index 8eb68bb9..5af88e46 100644
--- a/src/face_registry.cc
+++ b/src/face_registry.cc
@@ -121,7 +121,7 @@ FaceRegistry::FaceRegistry()
         { "StatusCursor", Face{ Color::Black, Color::Cyan } },
         { "Prompt", Face{ Color::Yellow, Color::Default } },
         { "MatchingChar", Face{ Color::Default, Color::Default, Attribute::Bold } },
-        { "BufferPadding", Face{ Color::Blue, Color::Default, Attribute::Bold } },
+        { "BufferPadding", Face{ Color::Blue, Color::Default } },
       }
 {}
 
diff --git a/src/ncurses_ui.cc b/src/ncurses_ui.cc
index 735c02a1..1837dcf1 100644
--- a/src/ncurses_ui.cc
+++ b/src/ncurses_ui.cc
@@ -7,7 +7,6 @@
 #include "keys.hh"
 #include "register_manager.hh"
 #include "utf8_iterator.hh"
-#include "face_registry.hh"
 
 #include <algorithm>
 
@@ -361,7 +360,7 @@ void NCursesUI::draw(const DisplayBuffer& display_buffer,
         ++line_index;
     }
 
-    set_face(m_window, { Color::Blue, Color::Default }, padding_face);
+    set_face(m_window, padding_face, default_face);
 
     const DisplayLine padding_line = m_buffer_padding_str;
     const DisplayLine* padding_line_ptr = m_buffer_padding_type != BufferPaddingType::None ?
diff --git a/src/ncurses_ui.hh b/src/ncurses_ui.hh
index 9e5b458a..88dd77c1 100644
--- a/src/ncurses_ui.hh
+++ b/src/ncurses_ui.hh
@@ -124,7 +124,7 @@ private:
     int m_wheel_up_button = 4;
     int m_wheel_down_button = 5;
 
-    String		  	  m_buffer_padding_str = "~";
+    String            m_buffer_padding_str = "~";
     BufferPaddingType m_buffer_padding_type = BufferPaddingType::None;
 
     bool m_set_title = true;