1 files changed, 2 insertions, 1 deletions

diff --git a/lisp/term/w32-win.el b/lisp/term/w32-win.el
index 55d680d5e5e..5067b46d15b 100644
--- a/lisp/term/w32-win.el
+++ b/lisp/term/w32-win.el
@@ -900,7 +900,8 @@ the font chosen, covering all the charsets that can be fully represented
 with the font."
   (interactive
    (if w32-use-w32-font-dialog
-       (list (w32-select-font))
+       (let ((chosen-font (w32-select-font)))
+         (and chosen-font (list chosen-font)))
      (x-popup-menu
       last-nonmenu-event
     ;; Append list of fontsets currently defined.