diff --git a/assets/default-keybindings.json b/assets/default-keybindings.json
index 0bdbec366..ef6c2e3ac 100644
--- a/assets/default-keybindings.json
+++ b/assets/default-keybindings.json
@@ -334,7 +334,7 @@
       "keys": ["Cmd:p"]
     },
     {
-      "command": "rightsidebar:open",
+      "command": "rightsidebar:toggle",
       "keys": ["Cmd:Shift:Space"]
     }
   ]
\ No newline at end of file
diff --git a/src/app/app.tsx b/src/app/app.tsx
index 2e10190f6..76d50bbcb 100644
--- a/src/app/app.tsx
+++ b/src/app/app.tsx
@@ -160,7 +160,7 @@ class App extends React.Component<{}, {}> {
                             </div>
                         </If>
                         <If condition={rightSidebarCollapsed && activeMainView == "session"}>
-                            <div className="right-sidebar-triggers" title="Open Wave AI">
+                            <div className="right-sidebar-triggers" title="Open Wave AI (Cmd-Shift-Space)">
                                 <Button
                                     className="secondary ghost right-sidebar-trigger"
                                     onClick={this.openRightSidebar}
diff --git a/src/app/sidebar/right.tsx b/src/app/sidebar/right.tsx
index 531dc833d..dc45a2cbe 100644
--- a/src/app/sidebar/right.tsx
+++ b/src/app/sidebar/right.tsx
@@ -57,21 +57,17 @@ class SidebarKeyBindings extends React.Component<{ component: RightSideBar; isOp
     componentDidMount(): void {
         const { component } = this.props;
         const keybindManager = GlobalModel.keybindManager;
-        keybindManager.registerKeybinding("pane", "rightsidebar", "rightsidebar:open", (waveEvent) => {
-            return component.onOpen();
+        keybindManager.registerKeybinding("pane", "rightsidebar", "rightsidebar:toggle", (waveEvent) => {
+            if (this.props.isOpen) {
+                return component.onClose();
+            } else {
+                return component.onOpen();
+            }
         });
     }
 
     componentDidUpdate(): void {
-        if (this.props.isOpen) {
-            const { component } = this.props;
-            const keybindManager = GlobalModel.keybindManager;
-            keybindManager.registerKeybinding("pane", "rightsidebar:close", "generic:cancel", (waveEvent) => {
-                return component.onClose();
-            });
-        } else {
-            GlobalModel.keybindManager.unregisterDomain("rightsidebar:close");
-        }
+        // remove for now (needs to take into account right sidebar focus so it doesn't conflict with other ESC keybindings)
     }
 
     componentWillUnmount(): void {
diff --git a/src/app/workspace/cmdinput/cmdinput.tsx b/src/app/workspace/cmdinput/cmdinput.tsx
index 68e2e2200..2cb0a9f6b 100644
--- a/src/app/workspace/cmdinput/cmdinput.tsx
+++ b/src/app/workspace/cmdinput/cmdinput.tsx
@@ -250,7 +250,7 @@ class CmdInput extends React.Component<{}, {}> {
                         </If>
                         <div
                             key="aichat"
-                            title="Wave AI (Ctrl-Space)"
+                            title="Wave AI (Cmd-Shift-Space)"
                             className="cmdinput-icon"
                             onClick={this.clickAIChatAction}
                         >
diff --git a/src/models/rightsidebar.ts b/src/models/rightsidebar.ts
index 235422414..b4ccfba05 100644
--- a/src/models/rightsidebar.ts
+++ b/src/models/rightsidebar.ts
@@ -70,10 +70,6 @@ class RightSidebarModel implements SidebarModel {
     }
 
     getCollapsed(): boolean {
-        // disable right sidebar in production
-        if (!this.globalModel.isDev) {
-            return true;
-        }
         const clientData = this.globalModel.clientData.get();
         const collapsed = clientData?.clientopts?.rightsidebar?.collapsed;
         if (this.isDragging.get()) {
diff --git a/waveshell/pkg/packet/packet.go b/waveshell/pkg/packet/packet.go
index 553e16e6f..d160d5512 100644
--- a/waveshell/pkg/packet/packet.go
+++ b/waveshell/pkg/packet/packet.go
@@ -88,7 +88,7 @@ const PacketEOFStr = "EOF"
 
 var TypeStrToFactory map[string]reflect.Type
 
-const OpenAICmdInfoChatGreetingMessage = "Hello, may I help you with this command?  \n(Ctrl-Space: open, ESC: close, Ctrl+L: clear chat buffer, Up/Down: select code blocks, Enter: to copy a selected code block to the command input)"
+const OpenAICmdInfoChatGreetingMessage = "Hello, how may I help you with this command?  \n(Cmd-Shift-Space: open/close, Ctrl+L: clear chat buffer, Up/Down: select code blocks, Enter: to copy a selected code block to the command input)"
 
 func init() {
 	TypeStrToFactory = make(map[string]reflect.Type)