diff --git a/mode-tree.c b/mode-tree.c
index a63602c6..e1170a3d 100644
--- a/mode-tree.c
+++ b/mode-tree.c
@@ -1044,8 +1044,11 @@ mode_tree_display_menu(struct mode_tree_data *mtd, struct client *c, u_int x,
 	else
 		x = 0;
 	if (menu_display(menu, 0, 0, NULL, x, y, c, BOX_LINES_DEFAULT, NULL,
-	    NULL, NULL, NULL, mode_tree_menu_callback, mtm) != 0)
+	    NULL, NULL, NULL, mode_tree_menu_callback, mtm) != 0) {
+		mode_tree_remove_ref(mtd);
+		free(mtm);
 		menu_free(menu);
+	}
 }
 
 int
diff --git a/tmux.1 b/tmux.1
index 852940bc..0d34b747 100644
--- a/tmux.1
+++ b/tmux.1
@@ -375,7 +375,8 @@ pane.
 Arrange panes in one of the seven preset layouts:
 even-horizontal, even-vertical,
 main-horizontal, main-horizontal-mirrored,
-main-vertical, main-vertical, or tiled.
+main-vertical, main-vertical-mirrored,
+or tiled.
 .It Space
 Arrange the current window in the next preset layout.
 .It M-n