diff --git a/src/lib/components/chat/MessageInput.svelte b/src/lib/components/chat/MessageInput.svelte
index 7c1c87704..81f1ecd10 100644
--- a/src/lib/components/chat/MessageInput.svelte
+++ b/src/lib/components/chat/MessageInput.svelte
@@ -828,13 +828,19 @@
 										e.preventDefault();
 									}
 
-									if (e.key === 'Enter' && !e.shiftKey && prompt !== '') {
-										submitPrompt(prompt, user);
-										return;
-									}
+									const commandOptionButton = [
+										...document.getElementsByClassName('selected-command-option-button')
+									]?.at(-1);
 
-									if (e.key === 'Enter' && e.shiftKey && prompt !== '') {
-										return;
+									if (!commandOptionButton) {
+										if (e.key === 'Enter' && !e.shiftKey && prompt !== '' && selected) {
+											submitPrompt(prompt, user);
+											return;
+										}
+
+										if (e.key === 'Enter' && e.shiftKey && prompt !== '') {
+											return;
+										}
 									}
 								}