diff --git a/frontend/src/components/Sidebar/ActiveWorkspaces/index.jsx b/frontend/src/components/Sidebar/ActiveWorkspaces/index.jsx
index 20394f5f..a19ad063 100644
--- a/frontend/src/components/Sidebar/ActiveWorkspaces/index.jsx
+++ b/frontend/src/components/Sidebar/ActiveWorkspaces/index.jsx
@@ -123,8 +123,6 @@ export default function ActiveWorkspaces() {
                               ? null
                               : paths.workspace.chat(workspace.slug)
                           }
-                          data-tooltip-id="workspace-name"
-                          data-tooltip-content={workspace.name}
                           aria-current={isActive ? "page" : ""}
                           className={`
                             transition-all duration-[200ms]
@@ -144,7 +142,11 @@ export default function ActiveWorkspaces() {
                                 weight="bold"
                               />
                             </div>
-                            <div className="flex items-center space-x-2 overflow-hidden flex-grow">
+                            <div
+                              data-tooltip-id="workspace-name"
+                              data-tooltip-content={workspace.name}
+                              className="flex items-center space-x-2 overflow-hidden flex-grow"
+                            >
                               <div className="w-[130px] overflow-hidden">
                                 <p
                                   className={`
@@ -168,6 +170,8 @@ export default function ActiveWorkspaces() {
                                     setSelectedWs(workspace);
                                     showModal();
                                   }}
+                                  data-tooltip-id="upload-workspace"
+                                  data-tooltip-content="Upload documents to this workspace for RAG indexing"
                                   className={`group/upload border-none rounded-md flex items-center justify-center ml-auto p-[2px] ${isActive ? "hover:bg-zinc-500 light:hover:bg-sky-800/30" : "hover:bg-zinc-500 light:hover:bg-slate-400"}`}
                                 >
                                   <UploadSimple
@@ -188,6 +192,8 @@ export default function ActiveWorkspaces() {
                                   }}
                                   className={`group/gear rounded-md flex items-center justify-center ml-auto p-[2px] ${isActive ? "hover:bg-zinc-500 light:hover:bg-sky-800/30" : "hover:bg-zinc-500 light:hover:bg-slate-400"}`}
                                   aria-label="General appearance settings"
+                                  data-tooltip-id="gear-workspace"
+                                  data-tooltip-content="General appearance settings"
                                 >
                                   <GearSix
                                     color={
diff --git a/frontend/src/components/Sidebar/index.jsx b/frontend/src/components/Sidebar/index.jsx
index 353a8af1..fcae24b5 100644
--- a/frontend/src/components/Sidebar/index.jsx
+++ b/frontend/src/components/Sidebar/index.jsx
@@ -222,6 +222,18 @@ function WorkspaceAndThreadTooltips() {
         delayShow={800}
         className="tooltip !text-xs z-99"
       />
+      <Tooltip
+        id="upload-workspace"
+        place="top"
+        delayShow={300}
+        className="tooltip !text-xs z-99"
+      />
+      <Tooltip
+        id="gear-workspace"
+        place="top"
+        delayShow={300}
+        className="tooltip !text-xs z-99"
+      />
     </React.Fragment>,
     document.body
   );