From 583ce9b71ec1d24e62fd4f2aec4d369f63873c35 Mon Sep 17 00:00:00 2001
From: Nicholas Matlaga <nmatlaga@outlawtack.com>
Date: Wed, 13 Dec 2017 21:08:02 -0500
Subject: [PATCH] Step through help and option popup when closing

---
 evennia/web/webclient/static/webclient/js/webclient_gui.js | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/evennia/web/webclient/static/webclient/js/webclient_gui.js b/evennia/web/webclient/static/webclient/js/webclient_gui.js
index ba657858d9..57d9b0b7c0 100644
--- a/evennia/web/webclient/static/webclient/js/webclient_gui.js
+++ b/evennia/web/webclient/static/webclient/js/webclient_gui.js
@@ -175,8 +175,11 @@ function onKeydown (event) {
     }
 
     if (code === 27) { // Escape key
-        closePopup("#optionsdialog");
-        closePopup("#helpdialog");
+        if ($('#helpdialog').is(':visible')) {
+          closePopup("#helpdialog");
+        } else {
+          closePopup("#optionsdialog");
+        }
     }
 
     if (history_entry !== null) {