diff --git a/helix-core/src/indent.rs b/helix-core/src/indent.rs
index ae26c13e0..fad1595cc 100644
--- a/helix-core/src/indent.rs
+++ b/helix-core/src/indent.rs
@@ -21,8 +21,9 @@ pub enum IndentStyle {
 }
 
 // 16 spaces
-const INDENTS: &str = "                ";
-pub const MAX_INDENT: u8 = 16;
+// TODO: up this to 64 or something
+const INDENTS: &str = "                                                                ";
+pub const MAX_INDENT: u8 = 64;
 
 impl IndentStyle {
     /// Creates an `IndentStyle` from an indentation string.
diff --git a/helix-core/src/syntax.rs b/helix-core/src/syntax.rs
index 7de6ddf44..fd4019501 100644
--- a/helix-core/src/syntax.rs
+++ b/helix-core/src/syntax.rs
@@ -59,11 +59,11 @@ fn deserialize_tab_width<'de, D>(deserializer: D) -> Result<usize, D::Error>
     D: serde::Deserializer<'de>,
 {
     usize::deserialize(deserializer).and_then(|n| {
-        if n > 0 && n <= 16 {
+        if n > 0 && n <= 64 {
             Ok(n)
         } else {
             Err(serde::de::Error::custom(
-                "tab width must be a value from 1 to 16 inclusive",
+                "tab width must be a value from 1 to 64 inclusive",
             ))
         }
     })