diff --git a/src/ChangeLog b/src/ChangeLog
index 23a880a21..7d2fc8bfa 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -2,6 +2,8 @@
 
 	* view.c (view_growbuf_read_until): When using mc_read, recover
 	from interrupted system calls.
+	* view.c (toggle_hex_mode): Now the hex cursor is always visible
+	after switching to hex mode.
 
 2005-08-15  Jindrich Makovicka  <makovick@kmlinux.fjfi.cvut.cz>
 
diff --git a/src/view.c b/src/view.c
index f679b9982..86d4fcbbd 100644
--- a/src/view.c
+++ b/src/view.c
@@ -2588,7 +2588,8 @@ toggle_hex_mode (WView *view)
     view->hex_mode = !view->hex_mode;
 
     if (view->hex_mode) {
-	view->hex_cursor =
+	view->hex_cursor = view->dpy_topleft;
+	view->dpy_topleft =
 	    offset_rounddown (view->dpy_topleft, view->bytes_per_line);
 	view->widget.options |= W_WANT_CURSOR;
     } else {