diff --git a/src/js/commandline.js b/src/js/commandline.js
index 2b03a86cf..52f6b7096 100644
--- a/src/js/commandline.js
+++ b/src/js/commandline.js
@@ -1766,17 +1766,17 @@ $("#commandLine input").keyup((e) => {
 $(document).ready((e) => {
   $(document).keydown((event) => {
     //escape
-    if (
-      (event.keyCode == 27 && !config.swapEscAndTab) ||
-      (event["keyCode"] == 9 && config.swapEscAndTab)
-    ) {
+    if (event.keyCode == 27 || (event.keyCode == 9 && config.swapEscAndTab)) {
       event.preventDefault();
       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")) {
+      } else if (
+        $("#commandLineWrapper").hasClass("hidden") &&
+        (event.keyCode == 9 || !config.swapEscAndTab)
+      ) {
         if (config.singleListCommandLine == "on")
           useSingleListCommandLine(false);
         else currentCommands = [commands];
diff --git a/src/js/script.js b/src/js/script.js
index ca8741a65..96c814b8d 100644
--- a/src/js/script.js
+++ b/src/js/script.js
@@ -4565,7 +4565,8 @@ function handleTab(event) {
     !$(".pageLogin").hasClass("active") &&
     !resultCalculating &&
     $("#commandLineWrapper").hasClass("hidden") &&
-    $("#simplePopupWrapper").hasClass("hidden")
+    $("#simplePopupWrapper").hasClass("hidden") &&
+    $("#leaderboardsWrapper").hasClass("hidden")
   ) {
     event.preventDefault();
     if ($(".pageTest").hasClass("active")) {