diff --git a/src/ChangeLog b/src/ChangeLog
index a75ec18fb1..dea1a7a17d 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2002-05-24  Juergen Vigna  <jug@sad.it>
+
+	* undo_funcs.C (textHandleUndo): fix the cursor selection after
+	setting the undo_cursor.
+
 2002-05-23  John Levon  <moz@compsoc.man.ac.uk>
 
 	* BufferView_pimpl.C:
diff --git a/src/undo_funcs.C b/src/undo_funcs.C
index d8304ed94b..8a9afeee35 100644
--- a/src/undo_funcs.C
+++ b/src/undo_funcs.C
@@ -240,6 +240,10 @@ bool textHandleUndo(BufferView * bv, Undo * undo)
 					t = bv->text;
 				}
 				t->setCursorIntern(bv, tmppar, undo->cursor_pos);
+				// clear any selection and set the selection cursor
+				// for an evt. new selection.
+				t->clearSelection();
+				t->selection.cursor = t->cursor;
 				t->updateCounters(bv, t->cursor.row());
 				bv->fitCursor();
 			}
@@ -258,6 +262,10 @@ bool textHandleUndo(BufferView * bv, Undo * undo)
 					t = bv->text;
 				}
 				t->setCursorIntern(bv, tmppar, undo->cursor_pos);
+				// clear any selection and set the selection cursor
+				// for an evt. new selection.
+				t->clearSelection();
+				t->selection.cursor = t->cursor;
 				t->updateCounters(bv, t->cursor.row());
 			}
 		}