diff --git a/apps/desktop/src/components/right-panel/components/chat/chat-input.tsx b/apps/desktop/src/components/right-panel/components/chat/chat-input.tsx
index 49c9bdf811..d929ddf656 100644
--- a/apps/desktop/src/components/right-panel/components/chat/chat-input.tsx
+++ b/apps/desktop/src/components/right-panel/components/chat/chat-input.tsx
@@ -123,10 +123,11 @@ export function ChatInput(
         {entityId
           ? (
             <Badge
-              className="mr-2 bg-white text-black border border-border inline-flex items-center gap-1 hover:bg-neutral-100 cursor-pointer"
+              className="mr-2 bg-white text-black border border-border inline-flex items-center gap-1 hover:bg-neutral-100 cursor-pointer max-w-48"
               onClick={onNoteBadgeClick}
             >
-              {getBadgeIcon()} {entityTitle}
+              {getBadgeIcon()}
+              <span className="truncate">{entityTitle}</span>
             </Badge>
           )
           : <div></div>}
diff --git a/apps/desktop/src/components/toolbar/buttons/chat-panel-button.tsx b/apps/desktop/src/components/toolbar/buttons/chat-panel-button.tsx
index a1184c8b8d..3c027d538e 100644
--- a/apps/desktop/src/components/toolbar/buttons/chat-panel-button.tsx
+++ b/apps/desktop/src/components/toolbar/buttons/chat-panel-button.tsx
@@ -25,6 +25,21 @@ function ChatPanelButtonBase() {
     return () => clearInterval(animationInterval);
   }, []);
 
+  useEffect(() => {
+    const handleKeyDown = (event: KeyboardEvent) => {
+      if (event.key === "j" && (event.metaKey || event.ctrlKey)) {
+        event.preventDefault();
+        togglePanel("chat");
+      }
+    };
+
+    document.addEventListener("keydown", handleKeyDown);
+
+    return () => {
+      document.removeEventListener("keydown", handleKeyDown);
+    };
+  }, [togglePanel]);
+
   const handleClick = () => {
     togglePanel("chat");
   };
diff --git a/apps/desktop/src/locales/en/messages.po b/apps/desktop/src/locales/en/messages.po
index 456eea0db5..e01779538f 100644
--- a/apps/desktop/src/locales/en/messages.po
+++ b/apps/desktop/src/locales/en/messages.po
@@ -1187,7 +1187,7 @@ msgstr "This is the name of the company you work for."
 msgid "Today"
 msgstr "Today"
 
-#: src/components/toolbar/buttons/chat-panel-button.tsx:52
+#: src/components/toolbar/buttons/chat-panel-button.tsx:67
 msgid "Toggle chat panel"
 msgstr "Toggle chat panel"
 
diff --git a/apps/desktop/src/locales/ko/messages.po b/apps/desktop/src/locales/ko/messages.po
index 22ae7f2fde..892cafe67b 100644
--- a/apps/desktop/src/locales/ko/messages.po
+++ b/apps/desktop/src/locales/ko/messages.po
@@ -1187,7 +1187,7 @@ msgstr ""
 msgid "Today"
 msgstr ""
 
-#: src/components/toolbar/buttons/chat-panel-button.tsx:52
+#: src/components/toolbar/buttons/chat-panel-button.tsx:67
 msgid "Toggle chat panel"
 msgstr ""