diff --git a/NEWS b/NEWS
index 89e97808..c560a4fa 100644
--- a/NEWS
+++ b/NEWS
@@ -34,6 +34,9 @@ lnav v0.9.1:
        in the copy if they are enabled.
      * Log messages that cannot be parsed properly will be given an "invalid"
        log level and the invalid portions colored yellow.
+     * The range_start and range_stop values of the regexp_capture() results
+       now start at 1 instead of zero to match with what the other SQL string
+       functions expect.
 
      Fixes:
      * Unicode text can now be entered in prompts.
diff --git a/src/internals/sql-ref.rst b/src/internals/sql-ref.rst
index 1dea32ea..653bcaa5 100644
--- a/src/internals/sql-ref.rst
+++ b/src/internals/sql-ref.rst
@@ -2683,12 +2683,12 @@ regexp_capture(*string*, *pattern*)
 
       ;SELECT * FROM regexp_capture('a=1; b=2', '(\w+)=(\d+)')
       match_index capture_index capture_name capture_count range_start range_stop content 
-                0             0 <NULL>                   3           0          3 a=1     
-                0             1                          3           0          1 a       
-                0             2                          3           2          3 1       
-                1             0 <NULL>                   3           5          8 b=2     
-                1             1                          3           5          6 b       
-                1             2                          3           7          8 2       
+                0             0 <NULL>                   3           1          4 a=1     
+                0             1                          3           1          2 a       
+                0             2                          3           3          4 1       
+                1             0 <NULL>                   3           6          9 b=2     
+                1             1                          3           6          7 b       
+                1             2                          3           8          9 2       
 
   **See Also:**
 
diff --git a/src/regexp_vtab.cc b/src/regexp_vtab.cc
index 366541e6..2ab3e990 100644
--- a/src/regexp_vtab.cc
+++ b/src/regexp_vtab.cc
@@ -141,10 +141,10 @@ CREATE TABLE regexp_capture (
                 sqlite3_result_int64(ctx, vc.c_context.get_count());
                 break;
             case RC_COL_RANGE_START:
-                sqlite3_result_int64(ctx, cap.c_begin);
+                sqlite3_result_int64(ctx, cap.c_begin + 1);
                 break;
             case RC_COL_RANGE_STOP:
-                sqlite3_result_int64(ctx, cap.c_end);
+                sqlite3_result_int64(ctx, cap.c_end + 1);
                 break;
             case RC_COL_CONTENT:
                 if (cap.is_valid()) {
diff --git a/src/view_curses.cc b/src/view_curses.cc
index 6b0500ec..47ec3cff 100644
--- a/src/view_curses.cc
+++ b/src/view_curses.cc
@@ -235,7 +235,7 @@ void view_curses::mvwattrline(WINDOW *window,
         }
 
         if (attr_range.lr_end == -1) {
-            attr_range.lr_end = line_width_chars;
+            attr_range.lr_end = lr_chars.lr_start + line_width_chars;
         }
         if (attr_range.lr_end < lr_chars.lr_start) {
             continue;
diff --git a/test/test_sql_str_func.sh b/test/test_sql_str_func.sh
index fffecc1f..59c3c945 100644
--- a/test/test_sql_str_func.sh
+++ b/test/test_sql_str_func.sh
@@ -174,6 +174,13 @@ Row 0:
 EOF
 
 
+run_test ./drive_sql "SELECT substr('#foo', range_start) AS value FROM regexp_capture('#foo', '(\w+)') WHERE capture_index = 1"
+
+check_output "" <<EOF
+ Row 0:
+  Column      value: foo
+EOF
+
 run_test ./drive_sql "SELECT * FROM regexp_capture('foo bar', '\w+ (\w+)')"
 
 check_output "" <<EOF
@@ -182,16 +189,16 @@ Row 0:
   Column capture_index: 0
   Column capture_name: (null)
   Column capture_count: 2
-  Column range_start: 0
-  Column range_stop: 7
+  Column range_start: 1
+  Column range_stop: 8
   Column    content: foo bar
 Row 1:
   Column match_index: 0
   Column capture_index: 1
   Column capture_name:
   Column capture_count: 2
-  Column range_start: 4
-  Column range_stop: 7
+  Column range_start: 5
+  Column range_stop: 8
   Column    content: bar
 EOF
 
@@ -203,8 +210,8 @@ Row 0:
   Column capture_index: 0
   Column capture_name: (null)
   Column capture_count: 1
-  Column range_start: 0
-  Column range_stop: 7
+  Column range_start: 1
+  Column range_stop: 8
   Column    content: foo bar
 EOF
 
@@ -216,16 +223,16 @@ Row 0:
   Column capture_index: 0
   Column capture_name: (null)
   Column capture_count: 2
-  Column range_start: 0
-  Column range_stop: 7
+  Column range_start: 1
+  Column range_stop: 8
   Column    content: foo bar
 Row 1:
   Column match_index: 0
   Column capture_index: 1
   Column capture_name: word
   Column capture_count: 2
-  Column range_start: 4
-  Column range_stop: 7
+  Column range_start: 5
+  Column range_stop: 8
   Column    content: bar
 EOF
 
@@ -237,24 +244,24 @@ Row 0:
   Column capture_index: 0
   Column capture_name: (null)
   Column capture_count: 3
-  Column range_start: 0
-  Column range_stop: 7
+  Column range_start: 1
+  Column range_stop: 8
   Column    content: foo bar
 Row 1:
   Column match_index: 0
   Column capture_index: 1
   Column capture_name:
   Column capture_count: 3
-  Column range_start: -1
-  Column range_stop: -1
+  Column range_start: 0
+  Column range_stop: 0
   Column    content: (null)
 Row 2:
   Column match_index: 0
   Column capture_index: 2
   Column capture_name: word
   Column capture_count: 3
-  Column range_start: 4
-  Column range_stop: 7
+  Column range_start: 5
+  Column range_stop: 8
   Column    content: bar
 EOF
 
@@ -282,64 +289,64 @@ Row 0:
   Column capture_index: 0
   Column capture_name: (null)
   Column capture_count: 2
-  Column range_start: 0
-  Column range_stop: 1
+  Column range_start: 1
+  Column range_stop: 2
   Column    content: 1
 Row 1:
   Column match_index: 0
   Column capture_index: 1
   Column capture_name:
   Column capture_count: 2
-  Column range_start: 0
-  Column range_stop: 1
+  Column range_start: 1
+  Column range_stop: 2
   Column    content: 1
 Row 2:
   Column match_index: 1
   Column capture_index: 0
   Column capture_name: (null)
   Column capture_count: 2
-  Column range_start: 2
-  Column range_stop: 3
+  Column range_start: 3
+  Column range_stop: 4
   Column    content: 2
 Row 3:
   Column match_index: 1
   Column capture_index: 1
   Column capture_name:
   Column capture_count: 2
-  Column range_start: 2
-  Column range_stop: 3
+  Column range_start: 3
+  Column range_stop: 4
   Column    content: 2
 Row 4:
   Column match_index: 2
   Column capture_index: 0
   Column capture_name: (null)
   Column capture_count: 2
-  Column range_start: 4
-  Column range_stop: 5
+  Column range_start: 5
+  Column range_stop: 6
   Column    content: 3
 Row 5:
   Column match_index: 2
   Column capture_index: 1
   Column capture_name:
   Column capture_count: 2
-  Column range_start: 4
-  Column range_stop: 5
+  Column range_start: 5
+  Column range_stop: 6
   Column    content: 3
 Row 6:
   Column match_index: 3
   Column capture_index: 0
   Column capture_name: (null)
   Column capture_count: 2
-  Column range_start: 6
-  Column range_stop: 8
+  Column range_start: 7
+  Column range_stop: 9
   Column    content: 45
 Row 7:
   Column match_index: 3
   Column capture_index: 1
   Column capture_name:
   Column capture_count: 2
-  Column range_start: 6
-  Column range_stop: 8
+  Column range_start: 7
+  Column range_stop: 9
   Column    content: 45
 EOF
 
@@ -351,7 +358,7 @@ Row 0:
   Column capture_index: 0
   Column capture_name: (null)
   Column capture_count: 1
-  Column range_start: 0
-  Column range_stop: 3
+  Column range_start: 1
+  Column range_stop: 4
   Column    content: foo
 EOF