diff --git a/src-ui/app/main_page/main_section/message_container/message_input_box/MessageInputBox.jsx b/src-ui/app/main_page/main_section/message_container/message_input_box/MessageInputBox.jsx
index 6aa8a4e6..2f1eb8ba 100644
--- a/src-ui/app/main_page/main_section/message_container/message_input_box/MessageInputBox.jsx
+++ b/src-ui/app/main_page/main_section/message_container/message_input_box/MessageInputBox.jsx
@@ -53,12 +53,6 @@ export const MessageInputBox = () => {
     };
 
     const onKeyDownFunction = (e) => {
-        if (currentSendMessageButtonType.data === "show_and_disable_enter_key") return;
-
-        if (e.keyCode === 13 && !e.shiftKey) {
-            onSubmitFunction(e);
-        }
-
         if (e.key === "ArrowUp" && e.shiftKey) {
             e.preventDefault();
 
@@ -82,6 +76,13 @@ export const MessageInputBox = () => {
                 );
             }
         }
+
+        if (currentSendMessageButtonType.data === "show_and_disable_enter_key") return;
+
+        if (e.keyCode === 13 && !e.shiftKey) {
+            onSubmitFunction(e);
+        }
+
     };
 
     return (