diff --git a/CHANGES b/CHANGES
index 9feca481..3d833407 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,4 @@
-CHANGES FROM 3.1 TO 3.2
+CHANGES FROM 3.1b TO 3.2
 
 * Improve search match marking in copy mode. Two new options
   copy-mode-match-style and copy-mode-current-match-style to set the style for
@@ -153,6 +153,10 @@ CHANGES FROM 3.1 TO 3.2
 
 * Add number operators for formats (+, -, *, / and m),
 
+CHANGES FROM 3.1a TO 3.1b
+
+* Fix crash when allow-rename is on and an empty name is set.
+
 CHANGES FROM 3.1 TO 3.1a
 
 * Do not close stdout prematurely in control mode since it is needed to print
diff --git a/input.c b/input.c
index 5b4c42f8..97dcbdb0 100644
--- a/input.c
+++ b/input.c
@@ -2354,7 +2354,7 @@ input_exit_rename(struct input_ctx *ictx)
 		return;
 
 	if (ictx->input_len == 0) {
-		oe = options_get(wp->window->options, "automatic-rename");
+		oe = options_get_only(wp->window->options, "automatic-rename");
 		if (oe != NULL)
 			options_remove(oe);
 		return;