diff --git a/src/frontend/src/modals/formModal/chatMessage/index.tsx b/src/frontend/src/modals/formModal/chatMessage/index.tsx
index 5c318cb17..8cbf0877c 100644
--- a/src/frontend/src/modals/formModal/chatMessage/index.tsx
+++ b/src/frontend/src/modals/formModal/chatMessage/index.tsx
@@ -150,8 +150,8 @@ export default function ChatMessage({
           </div>
         </div>
       ) : (
-        <div className="flex flex-col">
-          {template && (
+        <div>
+          {template ? (
             <>
               <button
                 className="form-modal-initial-prompt-btn"
@@ -167,40 +167,41 @@ export default function ChatMessage({
                 />
               </button>
               <span className="prose inline-block break-words text-primary dark:prose-invert">
-                {promptOpen &&
-                  template?.split("\n")?.map((line, index) => {
-                    const regex = /{([^}]+)}/g;
-                    let match;
-                    let parts = [];
-                    let lastIndex = 0;
-                    while ((match = regex.exec(line)) !== null) {
-                      // Push text up to the match
-                      if (match.index !== lastIndex) {
-                        parts.push(line.substring(lastIndex, match.index));
-                      }
-                      // Push div with matched text
-                      if (chat.message[match[1]]) {
-                        parts.push(
-                          <span className="chat-message-highlight">
-                            {chat.message[match[1]]}
-                          </span>
-                        );
-                      }
+                {promptOpen
+                  ? template?.split("\n")?.map((line, index) => {
+                      const regex = /{([^}]+)}/g;
+                      let match;
+                      let parts = [];
+                      let lastIndex = 0;
+                      while ((match = regex.exec(line)) !== null) {
+                        // Push text up to the match
+                        if (match.index !== lastIndex) {
+                          parts.push(line.substring(lastIndex, match.index));
+                        }
+                        // Push div with matched text
+                        if (chat.message[match[1]]) {
+                          parts.push(
+                            <span className="chat-message-highlight">
+                              {chat.message[match[1]]}
+                            </span>
+                          );
+                        }
 
-                      // Update last index
-                      lastIndex = regex.lastIndex;
-                    }
-                    // Push text after the last match
-                    if (lastIndex !== line.length) {
-                      parts.push(line.substring(lastIndex));
-                    }
-                    return <p>{parts}</p>;
-                  })}
+                        // Update last index
+                        lastIndex = regex.lastIndex;
+                      }
+                      // Push text after the last match
+                      if (lastIndex !== line.length) {
+                        parts.push(line.substring(lastIndex));
+                      }
+                      return <p>{parts}</p>;
+                    })
+                  : chat.message[chat.chatKey]}
               </span>
             </>
+          ) : (
+            <span>{chat.message[chat.chatKey]}</span>
           )}
-          <br />
-          <span>{chat.message[chat.chatKey]}</span>
         </div>
       )}
     </div>