From 9c222408c2ae892f0d697e9317f2bcec7fd446b0 Mon Sep 17 00:00:00 2001
From: willerbee <wagulo@gmail.com>
Date: Wed, 14 Oct 2020 08:43:17 +0800
Subject: [PATCH] resolving conflict

---
 public/js/commandline.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/public/js/commandline.js b/public/js/commandline.js
index b7dab50cc..907bfa08c 100644
--- a/public/js/commandline.js
+++ b/public/js/commandline.js
@@ -1431,7 +1431,11 @@ $(document).ready((e) => {
     //escape
     if ((event.keyCode == 27 && !config.swapEscAndTab) || (event["keyCode"] == 9 && config.swapEscAndTab)) {
       event.preventDefault();
-      if ($("#commandLineWrapper").hasClass("hidden")) {
+      if (!$("#leaderboardsWrapper").hasClass("hidden")) {  //maybe add more condition for closing other dialogs in the future as well
+        event.preventDefault();
+        hideLeaderboards();
+        return;
+      } else if ($("#commandLineWrapper").hasClass("hidden")) {
         if (config.singleListCommandLine == "on") 
           useSingleListCommandLine(false);
         else