diff --git a/src/lib/styles/pages/_chat.scss b/src/lib/styles/pages/_chat.scss
index 2a0c1075..ba3ded9b 100644
--- a/src/lib/styles/pages/_chat.scss
+++ b/src/lib/styles/pages/_chat.scss
@@ -749,6 +749,7 @@
 /* Header bar */
 .cb-head {
     position: relative;
+    z-index: 20;
     font-size: 1rem;
     padding: clamp(0.75rem, 2vmin, 1.25rem) 2%;
     height: 10%;
diff --git a/src/routes/chat/[agentId]/[conversationId]/chat-box.svelte b/src/routes/chat/[agentId]/[conversationId]/chat-box.svelte
index 506fbd0d..d651ab88 100644
--- a/src/routes/chat/[agentId]/[conversationId]/chat-box.svelte
+++ b/src/routes/chat/[agentId]/[conversationId]/chat-box.svelte
@@ -1094,6 +1094,8 @@
 	function toggleUserAddStateModal() {
 		isOpenUserAddStateModal = !isOpenUserAddStateModal;
 		if (isOpenUserAddStateModal) {
+			isHeaderStatesOpen = false;
+			isHeaderMenuOpen = false;
 			loadUserAddStates();
 		}
 	}