diff --git a/js/main.js b/js/main.js
index 9f77e4a7..8b31bbaa 100644
--- a/js/main.js
+++ b/js/main.js
@@ -788,11 +788,37 @@ initializeSidebars();
 
 // Add click event listeners to toggle buttons
 pastChatsToggle.addEventListener("click", () => {
+  const isCurrentlyOpen = !pastChatsRow.classList.contains("sidebar-hidden");
   toggleSidebar(pastChatsRow, pastChatsToggle);
+
+  if (isCurrentlyOpen) {
+    // If we just closed the left sidebar, also close the right sidebar
+    if (!chatControlsRow.classList.contains("sidebar-hidden")) {
+      toggleSidebar(chatControlsRow, chatControlsToggle, true);
+    }
+  } else {
+    // If we just opened the left sidebar, also open the right sidebar
+    if (chatControlsRow.classList.contains("sidebar-hidden")) {
+      toggleSidebar(chatControlsRow, chatControlsToggle, false);
+    }
+  }
 });
 
 chatControlsToggle.addEventListener("click", () => {
+  const isCurrentlyOpen = !chatControlsRow.classList.contains("sidebar-hidden");
   toggleSidebar(chatControlsRow, chatControlsToggle);
+
+  if (isCurrentlyOpen) {
+    // If we just closed the right sidebar, also close the left sidebar
+    if (!pastChatsRow.classList.contains("sidebar-hidden")) {
+      toggleSidebar(pastChatsRow, pastChatsToggle, true);
+    }
+  } else {
+    // If we just opened the right sidebar, also open the left sidebar
+    if (pastChatsRow.classList.contains("sidebar-hidden")) {
+      toggleSidebar(pastChatsRow, pastChatsToggle, false);
+    }
+  }
 });
 
 navigationToggle.addEventListener("click", () => {
diff --git a/js/show_controls.js b/js/show_controls.js
index c98102d3..f974d412 100644
--- a/js/show_controls.js
+++ b/js/show_controls.js
@@ -7,7 +7,6 @@ function toggle_controls(value) {
     // SHOW MODE: Click toggles to show hidden sidebars
     const navToggle = document.getElementById("navigation-toggle");
     const pastChatsToggle = document.getElementById("past-chats-toggle");
-    const chatControlsToggle = document.getElementById("chat-controls-toggle");
 
     if (navToggle && document.querySelector(".header_bar")?.classList.contains("sidebar-hidden")) {
       navToggle.click();
@@ -15,9 +14,6 @@ function toggle_controls(value) {
     if (pastChatsToggle && document.getElementById("past-chats-row")?.classList.contains("sidebar-hidden")) {
       pastChatsToggle.click();
     }
-    if (chatControlsToggle && document.getElementById("chat-controls")?.classList.contains("sidebar-hidden")) {
-      chatControlsToggle.click();
-    }
 
     // Show extensions only
     if (extensions) {
@@ -39,7 +35,6 @@ function toggle_controls(value) {
     // HIDE MODE: Click toggles to hide visible sidebars
     const navToggle = document.getElementById("navigation-toggle");
     const pastChatsToggle = document.getElementById("past-chats-toggle");
-    const chatControlsToggle = document.getElementById("chat-controls-toggle");
 
     if (navToggle && !document.querySelector(".header_bar")?.classList.contains("sidebar-hidden")) {
       navToggle.click();
@@ -47,9 +42,6 @@ function toggle_controls(value) {
     if (pastChatsToggle && !document.getElementById("past-chats-row")?.classList.contains("sidebar-hidden")) {
       pastChatsToggle.click();
     }
-    if (chatControlsToggle && !document.getElementById("chat-controls")?.classList.contains("sidebar-hidden")) {
-      chatControlsToggle.click();
-    }
 
     // Hide extensions only
     if (extensions) {