diff --git a/src/app/chat/chat-sidebar/chat-sidebar.component.html b/src/app/chat/chat-sidebar/chat-sidebar.component.html
index e95768a217..02aa7cdf15 100644
--- a/src/app/chat/chat-sidebar/chat-sidebar.component.html
+++ b/src/app/chat/chat-sidebar/chat-sidebar.component.html
@@ -79,6 +79,6 @@
         <i class="material-icons">{{ drawer.opened && deviceType !== deviceTypes.DESKTOP  ? 'chevron_left' : 'chevron_right' }}</i>
       </button>
     </div>
-    <planet-chat-window></planet-chat-window>
+    <planet-chat-window [isEditing]="isEditing"></planet-chat-window>
   </div>
 </mat-drawer-container>
diff --git a/src/app/chat/chat-window/chat-window.component.ts b/src/app/chat/chat-window/chat-window.component.ts
index 52a5a370e4..132b996404 100644
--- a/src/app/chat/chat-window/chat-window.component.ts
+++ b/src/app/chat/chat-window/chat-window.component.ts
@@ -36,6 +36,7 @@ export class ChatWindowComponent implements OnInit, OnDestroy, AfterViewInit {
   };
   providers: AIProvider[] = [];
   @Input() context: any;
+  @Input() isEditing: boolean;
   @Input() conversations: any[] | null = null;
   @ViewChild('chatInput') chatInput: ElementRef;
   @ViewChild('chat') chatContainer: ElementRef;
@@ -98,7 +99,9 @@ export class ChatWindowComponent implements OnInit, OnDestroy, AfterViewInit {
       .subscribe((conversationId) => {
         this.selectedConversationId = conversationId;
         this.fetchConversation(this.selectedConversationId?._id);
-        this.focusInput();
+        if (!this.isEditing) {
+          this.focusInput();
+        }
       }, error => {
         console.error('Error subscribing to selectedConversationId$', error);
       });
@@ -111,7 +114,9 @@ export class ChatWindowComponent implements OnInit, OnDestroy, AfterViewInit {
         this.provider = {
           name: aiService
         };
-        this.focusInput();
+        if (!this.isEditing) {
+          this.focusInput();
+        }
       }));
   }
 
diff --git a/src/app/chat/chat-window/chat-window.scss b/src/app/chat/chat-window/chat-window.scss
index d395950bd5..c54153d709 100644
--- a/src/app/chat/chat-window/chat-window.scss
+++ b/src/app/chat/chat-window/chat-window.scss
@@ -38,20 +38,3 @@
   right: 8px;
   transform: translateY(-50%);
 }
-
-.conversation-query {
-  text-align: left;
-  padding: 8px;
-  border-radius: 5px;
-  background-color: #{$primary};
-  color: white;
-}
-
-.conversation-response {
-  margin: 8px 16px;
-}
-
-.conversation-error {
-  color: #ff0000;
-  font-style: italic;
-}
diff --git a/src/app/news/news-list-item.scss b/src/app/news/news-list-item.scss
index a7f80f18cd..d17e2b5a5b 100644
--- a/src/app/news/news-list-item.scss
+++ b/src/app/news/news-list-item.scss
@@ -30,23 +30,6 @@ mat-card-content {
   padding: 40px;
 }
 
-.conversation-query {
-  text-align: left;
-  padding: 8px;
-  border-radius: 5px;
-  background-color: #{$primary};
-  color: white;
-}
-
-.conversation-response {
-  margin: 8px 16px;
-}
-
-.conversation-error {
-  color: #ff0000;
-  font-style: italic;
-}
-
 @media (max-width: $screen-md) {
   .chat-container {
     padding: 20px;
diff --git a/src/styles.scss b/src/styles.scss
index 894ef1cd08..af66eaccf6 100644
--- a/src/styles.scss
+++ b/src/styles.scss
@@ -643,6 +643,30 @@ body {
   }
 
   // Styles for the chat-output directive
+  .conversation-query {
+    text-align: left;
+    padding: 8px;
+    border-radius: 5px;
+    background-color: #{$primary};
+    color: white;
+  }
+
+  .chat-link {
+    color: white !important;
+    &:visited {
+      color: white !important;
+    }
+  }
+
+  .conversation-response {
+    margin: 8px 16px;
+  }
+
+  .conversation-error {
+    color: #ff0000;
+    font-style: italic;
+  }
+
   .code-block {
     position: relative;
     background-color: #2d2d2d;