diff --git a/src/renderer/src/pages/home/Inputbar/Inputbar.tsx b/src/renderer/src/pages/home/Inputbar/Inputbar.tsx
index 08d7327a..91a868de 100644
--- a/src/renderer/src/pages/home/Inputbar/Inputbar.tsx
+++ b/src/renderer/src/pages/home/Inputbar/Inputbar.tsx
@@ -188,6 +188,11 @@ const Inputbar: FC<Props> = ({ assistant, setActiveTopic }) => {
       sendMessage()
       return event.preventDefault()
     }
+
+    if (sendMessageShortcut === 'Command+Enter' && isEnterPressed && event.metaKey) {
+      sendMessage()
+      return event.preventDefault()
+    }
   }
 
   const addNewTopic = useCallback(async () => {
diff --git a/src/renderer/src/pages/home/Tabs/SettingsTab.tsx b/src/renderer/src/pages/home/Tabs/SettingsTab.tsx
index 162d3e5e..cff7f6d5 100644
--- a/src/renderer/src/pages/home/Tabs/SettingsTab.tsx
+++ b/src/renderer/src/pages/home/Tabs/SettingsTab.tsx
@@ -352,7 +352,8 @@ const SettingsTab: FC<Props> = (props) => {
             options={[
               { value: 'Enter', label: 'Enter' },
               { value: 'Shift+Enter', label: `Shift + Enter` },
-              { value: 'Ctrl+Enter', label: `Ctrl + Enter` }
+              { value: 'Ctrl+Enter', label: `Ctrl + Enter` },
+              { value: 'Command+Enter', label: `CommandOrControl + Enter` }
             ]}
             onChange={(value) => setSendMessageShortcut(value)}
             style={{ width: 135 }}
diff --git a/src/renderer/src/store/settings.ts b/src/renderer/src/store/settings.ts
index 9560fa0d..8ac9d848 100644
--- a/src/renderer/src/store/settings.ts
+++ b/src/renderer/src/store/settings.ts
@@ -2,7 +2,7 @@ import { createSlice, PayloadAction } from '@reduxjs/toolkit'
 import { TRANSLATE_PROMPT } from '@renderer/config/prompts'
 import { CodeStyleVarious, LanguageVarious, ThemeMode } from '@renderer/types'
 
-export type SendMessageShortcut = 'Enter' | 'Shift+Enter' | 'Ctrl+Enter'
+export type SendMessageShortcut = 'Enter' | 'Shift+Enter' | 'Ctrl+Enter' | 'Command+Enter'
 
 export interface SettingsState {
   showAssistants: boolean