diff --git a/src/config/Config.zig b/src/config/Config.zig
index d9559fb..ec6d60a 100644
--- a/src/config/Config.zig
+++ b/src/config/Config.zig
@@ -37,7 +37,7 @@ cmatrix_max_codepoint: u16 = 0x7B,
 colormix_col1: u32 = 0x00FF0000,
 colormix_col2: u32 = 0x000000FF,
 colormix_col3: u32 = 0x20000000,
-custom_bind_width: u32 = 0,
+custom_bind_width: ?u32 = null,
 custom_sessions: []const u8 = build_options.config_directory ++ "/ly/custom-sessions",
 default_input: Input = .login,
 doom_fire_height: u8 = 6,
diff --git a/src/main.zig b/src/main.zig
index 46d9f36..aa7fb6c 100644
--- a/src/main.zig
+++ b/src/main.zig
@@ -1899,7 +1899,7 @@ fn positionWidgets(ptr: *anyopaque) !void {
                 .addY(y_offset)
                 .addX(x_offset));
             x_offset += item.lbl.text.len + 1;
-            if (x_offset > state.config.custom_bind_width) {
+            if (x_offset + item.lbl.text.len > state.config.custom_bind_width orelse state.buffer.width) {
                 x_offset = 0;
                 y_offset += 1;
             }