diff --git a/app/components/layout/GlobalSearch.tsx b/app/components/layout/GlobalSearch.tsx
index ccd599cf0..81805f49e 100644
--- a/app/components/layout/GlobalSearch.tsx
+++ b/app/components/layout/GlobalSearch.tsx
@@ -3,6 +3,7 @@ import type { TFunction } from "i18next";
 import { Search } from "lucide-react";
 import * as React from "react";
 import {
+	Button,
 	Dialog,
 	DialogTrigger,
 	ListBox,
@@ -136,15 +137,11 @@ export function GlobalSearch() {
 
 	return (
 		<DialogTrigger isOpen={isOpen} onOpenChange={handleOpenChange}>
-			<button
-				type="button"
-				className={styles.searchButton}
-				onClick={() => setIsOpen(true)}
-			>
+			<Button className={styles.searchButton}>
 				<Search className={styles.searchIcon} />
 				<span className={styles.searchPlaceholder}>{t("common:search")}</span>
 				<kbd className={styles.searchKbd}>{isMac ? "Cmd+K" : "Ctrl+K"}</kbd>
-			</button>
+			</Button>
 			<ModalOverlay className={styles.overlay} isDismissable>
 				<Modal className={styles.modal}>
 					<Dialog className={styles.dialog} aria-label={t("common:search")}>
diff --git a/app/components/layout/index.tsx b/app/components/layout/index.tsx
index b2067ed33..9474f3f75 100644
--- a/app/components/layout/index.tsx
+++ b/app/components/layout/index.tsx
@@ -387,21 +387,21 @@ export function Layout({
 							</Modal>
 						</ModalOverlay>
 					</DialogTrigger>
-					<DialogTrigger
+					<ModalOverlay
+						className={styles.chatSidebarModalOverlay}
+						isDismissable
 						isOpen={chatSidebarModalOpen}
 						onOpenChange={setChatSidebarModalOpen}
 					>
-						<ModalOverlay
-							className={styles.chatSidebarModalOverlay}
-							isDismissable
-						>
-							<Modal className={styles.chatSidebarModal}>
-								<Dialog className={styles.chatSidebarModalDialog}>
-									<ChatSidebar />
-								</Dialog>
-							</Modal>
-						</ModalOverlay>
-					</DialogTrigger>
+						<Modal className={styles.chatSidebarModal}>
+							<Dialog
+								className={styles.chatSidebarModalDialog}
+								aria-label={t("common:chat.sidebar.title")}
+							>
+								<ChatSidebar />
+							</Dialog>
+						</Modal>
+					</ModalOverlay>
 					<SideNavCollapseButton
 						onToggle={() => setSideNavCollapsed(!sideNavCollapsed)}
 						className={styles.sideNavCollapseButton}