diff --git a/ChangeLog b/ChangeLog
index 39c21015ecc2ba28d748cc06136a52cdb964e1ec..17ca8c257a6ce2ad73d1d025e471979fefa34a58 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,9 @@
 CVS Code -
+- files.c:
+  add_open_file()
+	- Get rid of unsetting MARK_ISSET because otherwise writing
+	  marked text will automatically unset the marker with
+	  multibuffer enabled.
 - global.c:
 	- Define currshortcut and currslen when either DISABLE_MOUSE
 	  or DISABLE_HELP or DISABLE_BROWSER is not defined (Silvan
diff --git a/files.c b/files.c
index 07c7916669d6718a9ea4d7261799b3db01793e1d..97552583ce3376a6c58b83f9d428641bfe2cfa13 100644
--- a/files.c
+++ b/files.c
@@ -533,10 +533,6 @@ int add_open_file(int update, int dup_fix)
     /* save current modification status */
     open_files->file_modified = ISSET(MODIFIED);
 
-    /* Unset the marker because nano can't (yet) handle marked text flipping between
-	open files */
-    UNSET(MARK_ISSET);
-
 #ifdef DEBUG
     fprintf(stderr, _("filename is %s"), open_files->data);
 #endif