diff --git a/client/src/components/CodeBlock/CodeFull/index.tsx b/client/src/components/CodeBlock/CodeFull/index.tsx
index 7584306c11..ef9a223e05 100644
--- a/client/src/components/CodeBlock/CodeFull/index.tsx
+++ b/client/src/components/CodeBlock/CodeFull/index.tsx
@@ -325,10 +325,11 @@ const CodeFull = ({
 
   const calculatePopupPosition = useCallback(
     (top: number, left: number) => {
-      if (!codeRef.current) {
+      const container = document.getElementById('result-full-code-container');
+      if (!container) {
         return null;
       }
-      const containerRect = codeRef.current?.getBoundingClientRect();
+      const containerRect = container?.getBoundingClientRect();
       if (
         isOnResultPage &&
         (currentSelection.length == 1 || currentSelection.length == 2)
@@ -351,6 +352,8 @@ const CodeFull = ({
 
       if (text) {
         setPopupPosition(calculatePopupPosition(clientY, clientX));
+      } else {
+        setPopupPosition(null);
       }
     };
 
@@ -427,6 +430,7 @@ const CodeFull = ({
                       <button
                         onClick={() => {
                           setChatOpen(true);
+                          setPopupPosition(null);
                           setThreadId('');
                           setConversation([]);
                           setSelectedLines([
@@ -462,6 +466,7 @@ const CodeFull = ({
                             }-${currentSelection[1]![0]}`,
                           );
                           setChatOpen(true);
+                          setPopupPosition(null);
                         }}
                         className="h-8 flex items-center justify-center gap-1 px-2 hover:bg-bg-base-hover caption text-label-title"
                       >
diff --git a/client/src/components/ModalOrSidebar/index.tsx b/client/src/components/ModalOrSidebar/index.tsx
index e57d7aac6d..900e5bcce5 100644
--- a/client/src/components/ModalOrSidebar/index.tsx
+++ b/client/src/components/ModalOrSidebar/index.tsx
@@ -122,7 +122,9 @@ const ModalOrSidebar = ({
             key="modal"
             className={`modal-or-sidebar overflow-hidden fixed flex flex-col ${
               isSidebar ? `border-y-0` : `rounded-md shadow-float`
-            } bg-bg-shade border border-bg-border z-[110] ${containerClassName}`}
+            } bg-bg-shade border border-bg-border ${
+              isSidebar ? 'z-60' : 'z-[110]'
+            } ${containerClassName}`}
             animate={
               isSidebar
                 ? sidebarAnimation(shouldStretch)
diff --git a/client/src/components/PageTemplate/Subheader.tsx b/client/src/components/PageTemplate/Subheader.tsx
index f99fe6cf64..97354d421c 100644
--- a/client/src/components/PageTemplate/Subheader.tsx
+++ b/client/src/components/PageTemplate/Subheader.tsx
@@ -62,7 +62,7 @@ const Subheader = () => {
   }, [navigationHistory]);
 
   return (
-    <div className="w-full bg-bg-shade py-2 pl-8 pr-6 flex items-center justify-between border-b border-bg-border shadow-medium relative z-90">
+    <div className="w-full bg-bg-shade py-2 pl-8 pr-6 flex items-center justify-between border-b border-bg-border shadow-medium relative z-70">
       <div className="flex flex-1 flex-col gap-3 justify-center overflow-hidden">
         <Breadcrumbs
           pathParts={breadcrumbs}
diff --git a/client/src/pages/ConversationResult/CodeAnotation/AnnotatedFile.tsx b/client/src/pages/ConversationResult/CodeAnotation/AnnotatedFile.tsx
index 85568473ac..e5a2f8239f 100644
--- a/client/src/pages/ConversationResult/CodeAnotation/AnnotatedFile.tsx
+++ b/client/src/pages/ConversationResult/CodeAnotation/AnnotatedFile.tsx
@@ -117,7 +117,7 @@ const AnnotatedFile = ({
   const fullHeight = useMemo(() => {
     return (
       mappedCites.reduce(
-        (prev, cur) => prev + ((cur.end || 0) - (cur.start || 0)),
+        (prev, cur) => prev + Math.max((cur.end || 0) - (cur.start || 0), 0),
         0,
       ) *
         21 +
diff --git a/client/src/pages/ResultFull/index.tsx b/client/src/pages/ResultFull/index.tsx
index deac7f08f0..d55d84f9ee 100644
--- a/client/src/pages/ResultFull/index.tsx
+++ b/client/src/pages/ResultFull/index.tsx
@@ -166,7 +166,10 @@ const ResultFull = ({ data, isLoading }: Props) => {
               repoPath={result?.repoPath || ''}
             />
           </div>
-          <div className="overflow-scroll flex-1">
+          <div
+            className="overflow-scroll flex-1"
+            id="result-full-code-container"
+          >
             <div className={`flex py-3 px-8 h-full`}>
               {!result ? (
                 <div className="w-full h-full flex flex-col gap-3">