diff --git a/edit/edit.c b/edit/edit.c
index 02d6cae8b..bfebb760e 100644
--- a/edit/edit.c
+++ b/edit/edit.c
@@ -1653,6 +1653,7 @@ edit_move_to_prev_col (WEdit * edit, long p)
             edit->over_col = 0;
         }
     } else {
+        edit->over_col = 0;
         if (is_in_indent (edit) && option_fake_half_tabs) {
             edit_update_curs_col (edit);
             if (space_width)
diff --git a/edit/editwidget.c b/edit/editwidget.c
index a4509068c..1b555f45b 100644
--- a/edit/editwidget.c
+++ b/edit/editwidget.c
@@ -95,14 +95,14 @@ edit_event (WEdit * edit, Gpm_Event * event, int *result)
         long line_len = edit_move_forward3 (edit, edit_bol (edit, edit->curs1), 0,
                                             edit_eol(edit, edit->curs1));
         if ( event->x > line_len ) {
-            edit->over_col = event->x - line_len;
+            edit->over_col = event->x - line_len  - option_line_state_width - 1;
             edit->prev_col = line_len;
         } else {
             edit->over_col = 0;
-            edit->prev_col = event->x;
+            edit->prev_col = event->x - option_line_state_width - 1;
         }
     } else {
-        edit->prev_col = event->x - edit->start_col - 1;
+        edit->prev_col = event->x - edit->start_col - option_line_state_width - 1;
     }
 
     if (--event->y > (edit->curs_row + 1))