diff --git a/web/panettone/src/panettone.lisp b/web/panettone/src/panettone.lisp
index d70110ef5..5473b2717 100644
--- a/web/panettone/src/panettone.lisp
+++ b/web/panettone/src/panettone.lisp
@@ -228,7 +228,8 @@
     (:header
      (:h1
       (who:esc
-       (if (id issue) "Edit Issue" "New Issue"))))
+       (if (and issue (id issue))
+           "Edit Issue" "New Issue"))))
     (:main
      (render/alert message)
      (:form :method "post"