diff --git a/ChangeLog b/ChangeLog
index 457ba7f3..3d38021a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,9 +1,8 @@
 2016-01-29  Benno Schulenberg  <bensberg@justemail.net>
 	* src/files.c (do_insertfile): Do display the buffer when configured
 	with only --disable-histories.  This fixes Savannah bug #47011.
-	* src/nano.c (main): For second or later files on the command line,
-	only check the position history when option 'positionlog' is set.
-	This fixes a bug that was unconsciously reported by Mike Frysinger.
+	* src/nano.c (main): Check position history only when 'positionlog'
+	is set.  This fixes a bug unconsciously reported by Mike Frysinger.
 	* src/files.c (do_lockfile): Plug a couple of memory leaks.
 
 2016-01-26  Benno Schulenberg  <bensberg@justemail.net>
diff --git a/src/nano.c b/src/nano.c
index 4dd3e0cb..a50aeb03 100644
--- a/src/nano.c
+++ b/src/nano.c
@@ -2666,7 +2666,7 @@ int main(int argc, char **argv)
     if (startline > 0 || startcol > 0)
 	do_gotolinecolumn(startline, startcol, FALSE, FALSE);
 #ifndef DISABLE_HISTORIES
-    else {
+    else if (ISSET(POS_HISTORY)) {
 	ssize_t savedposline, savedposcol;
 	/* If the file was edited before, restore the last cursor position. */
 	if (check_poshistory(argv[optind], &savedposline, &savedposcol))