diff --git a/CHANGELOG.md b/CHANGELOG.md
index bb027c55..0621aa1d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,7 @@
 
 ## Bugfixes
 
+- Fix long file name wrapping in header, see #2817 (@FilipRazek)
 - Fix `NO_COLOR` support, see #2767 (@acuteenvy)
 
 ## Other
diff --git a/src/printer.rs b/src/printer.rs
index cb80edc4..ca90bd3e 100644
--- a/src/printer.rs
+++ b/src/printer.rs
@@ -302,6 +302,23 @@ impl<'a> InteractivePrinter<'a> {
         }
     }
 
+    fn print_header_component_with_indent(&mut self, handle: &mut OutputHandle, content: &str) -> Result<()> {
+        self.print_header_component_indent(handle)?;
+        writeln!(handle, "{}", content)
+    }
+
+    fn print_header_multiline_component(&mut self, handle: &mut OutputHandle, content: &str) -> Result<()> {
+        let mut content = content;
+        let panel_width = if self.panel_width > 0 { self.panel_width + 2 } else { 0 };
+        let content_width = self.config.term_width - panel_width;
+        while content.len() > content_width {
+            let (content_line, remaining) = content.split_at(content_width);
+            self.print_header_component_with_indent(handle, content_line)?;
+            content = remaining;
+        }
+        self.print_header_component_with_indent(handle, content)
+    }
+
     fn preprocess(&self, text: &str, cursor: &mut usize) -> String {
         if self.config.tab_width > 0 {
             return expand_tabs(text, self.config.tab_width, cursor);
@@ -378,26 +395,26 @@ impl<'a> Printer for InteractivePrinter<'a> {
         }
 
         header_components.iter().try_for_each(|component| {
-            self.print_header_component_indent(handle)?;
-
             match component {
-                StyleComponent::HeaderFilename => writeln!(
-                    handle,
-                    "{}{}{}",
-                    description
-                        .kind()
-                        .map(|kind| format!("{}: ", kind))
-                        .unwrap_or_else(|| "".into()),
-                    self.colors.header_value.paint(description.title()),
-                    mode
-                ),
-
+                StyleComponent::HeaderFilename => {
+                    let header_filename = format!(
+                        "{}{}{}",
+                        description
+                            .kind()
+                            .map(|kind| format!("{}: ", kind))
+                            .unwrap_or_else(|| "".into()),
+                        self.colors.header_value.paint(description.title()),
+                        mode
+                    );
+                    self.print_header_multiline_component(handle, &header_filename)
+                }
                 StyleComponent::HeaderFilesize => {
                     let bsize = metadata
                         .size
                         .map(|s| format!("{}", ByteSize(s)))
                         .unwrap_or_else(|| "-".into());
-                    writeln!(handle, "Size: {}", self.colors.header_value.paint(bsize))
+                    let header_filesize = format!("Size: {}", self.colors.header_value.paint(bsize));
+                    self.print_header_multiline_component(handle, &header_filesize)
                 }
                 _ => Ok(()),
             }
diff --git a/tests/examples/this-file-path-is-really-long-and-would-have-broken-the-layout-of-the-header.txt b/tests/examples/this-file-path-is-really-long-and-would-have-broken-the-layout-of-the-header.txt
new file mode 100644
index 00000000..4dac98dc
--- /dev/null
+++ b/tests/examples/this-file-path-is-really-long-and-would-have-broken-the-layout-of-the-header.txt
@@ -0,0 +1 @@
+The header is not broken
\ No newline at end of file
diff --git a/tests/integration_tests.rs b/tests/integration_tests.rs
index be70fdca..10564f3a 100644
--- a/tests/integration_tests.rs
+++ b/tests/integration_tests.rs
@@ -1381,6 +1381,61 @@ fn header_full_binary() {
         .stderr("");
 }
 
+#[test]
+fn header_narrow_terminal() {
+    bat()
+        .arg("--terminal-width=30")
+        .arg("--decorations=always")
+        .arg("this-file-path-is-really-long-and-would-have-broken-the-layout-of-the-header.txt")
+        .assert()
+        .success()
+        .stdout(
+            "\
+───────┬──────────────────────
+       │ File: this-file-path-
+       │ is-really-long-and-wo
+       │ uld-have-broken-the-l
+       │ ayout-of-the-header.t
+       │ xt
+───────┼──────────────────────
+   1   │ The header is not bro
+       │ ken
+───────┴──────────────────────
+",
+        )
+        .stderr("");
+}
+
+#[test]
+fn header_very_narrow_terminal() {
+    bat()
+        .arg("--terminal-width=10")
+        .arg("--decorations=always")
+        .arg("this-file-path-is-really-long-and-would-have-broken-the-layout-of-the-header.txt")
+        .assert()
+        .success()
+        .stdout(
+            "\
+──────────
+File: this
+-file-path
+-is-really
+-long-and-
+would-have
+-broken-th
+e-layout-o
+f-the-head
+er.txt
+──────────
+The header
+ is not br
+oken
+──────────
+",
+        )
+        .stderr("");
+}
+
 #[test]
 #[cfg(feature = "git")] // Expected output assumes git is enabled
 fn header_default() {