diff --git a/public/script.js b/public/script.js
index c4719cf22..46c316fe9 100644
--- a/public/script.js
+++ b/public/script.js
@@ -1053,7 +1053,7 @@ async function Generate(type, automatic_trigger, force_name2) {//encode("dsfs").
         if (main_api === 'openai') {
             const oai_chat = [...chat];
 
-            if (type == 'swipe') { 
+            if (type == 'swipe') {
                 oai_chat.pop();
             }
 
@@ -1797,11 +1797,11 @@ function getChatResult() {
     select_selected_character(this_chid);
 }
 
-function openNavToggle() {
+/* function openNavToggle() {
     if (!$("#nav-toggle").prop("checked")) {
         $("#nav-toggle").trigger("click");
     }
-}
+} */
 
 ////////// OPTIMZED MAIN API CHANGE FUNCTION ////////////
 
@@ -4062,4 +4062,21 @@ $(document).ready(function () {
             drawer.toggleClass('closedDrawer openDrawer');
         }
     });
-});
+
+    $("html").click(function (e) {
+        var clickTarget = $(e.target);
+        var targetParentHasOpenDrawer = clickTarget.parents('.openDrawer').length;
+        console.log('clicking ' + clickTarget + ' parents have OpenDrawer? ' + targetParentHasOpenDrawer);
+        if (clickTarget.hasClass('drawer-icon') == false && !clickTarget.hasClass('openDrawer')) {                         // don't run this check on drawer icons, as causes insta-closes
+            if (jQuery.find('.openDrawer').length !== 0) {                          // only run if opendrawers actually exist
+                if (targetParentHasOpenDrawer === 0) {                              // check if clicked target is NOT part of an OpenDrawer, and if so...
+
+                    $('.openDrawer').slideToggle(200, "swing")                          //close all open drawers
+                    $('.openIcon').toggleClass('closedIcon openIcon');                  //set all icons   to closed state
+                    $('.openDrawer').toggleClass('closedDrawer openDrawer');            //set all drawers to closed state
+                }
+            }
+
+        }
+    });
+})
diff --git a/public/scripts/RossAscends-mods.js b/public/scripts/RossAscends-mods.js
index 6cf3c99a5..ac260b92f 100644
--- a/public/scripts/RossAscends-mods.js
+++ b/public/scripts/RossAscends-mods.js
@@ -234,12 +234,12 @@ function RA_autoconnect() {
 					RA_AC_retries = 1;
 				}
 				break;
-            case 'openai':
-                if (oai_settings.api_key_openai) {
-                    $("#api_button_openai").click();
-                    retry_delay = 100;
-                    RA_AC_retries = 1;
-                }
+			case 'openai':
+				if (oai_settings.api_key_openai) {
+					$("#api_button_openai").click();
+					retry_delay = 100;
+					RA_AC_retries = 1;
+				}
 		}
 
 		if (!connection_made) {
@@ -275,18 +275,6 @@ $("document").ready(function () {
 	$("#main_api").change(function () { RA_autoconnect(); });
 	$("#api_button").click(function () { setTimeout(RA_checkOnlineStatus, 100); });
 
-	//close the RightNav panel when user clicks outside of it or related panels (adv editing popup, or dialog popups)
-	$("html").click(function (e) {
-		if ($(NavToggle).prop("checked") &&
-			!$(PanelPin).prop("checked") &&
-			$(e.target).attr("id") !== "nav-toggle" &&
-			!RightNavPanel.contains(e.target) &&
-			!AdvancedCharDefsPopup.contains(e.target) &&
-			!ConfirmationPopup.contains(e.target)) {
-			NavToggle.click();
-		}
-	});
-
 	//save NavLock prefs and record state of the Nav being open or closed
 	$(NavToggle).on("change", function () { SaveLocal("NavOpened", $(NavToggle).prop("checked")); });
 	$(PanelPin).on("change", function () { SaveLocal("NavLockOn", $(PanelPin).prop("checked")); });