diff --git a/css/main.css b/css/main.css
index 0902b184..3fec7bb0 100644
--- a/css/main.css
+++ b/css/main.css
@@ -390,7 +390,7 @@ div.svelte-362y77>*, div.svelte-362y77>.form>* {
     margin-left: auto;
     margin-right: auto;
     flex: 1;
-    overflow-y: auto;
+    overflow-y: hidden;
     display: flex;
     flex-direction: column;
     word-break: break-word;
diff --git a/js/main.js b/js/main.js
index 205cf88e..6cecd341 100644
--- a/js/main.js
+++ b/js/main.js
@@ -152,7 +152,7 @@ const observer = new MutationObserver(function(mutations) {
   }
 
   const chatElement = document.getElementById("chat");
-  if (chatElement) {
+  if (chatElement && chatElement.getAttribute("data-mode") === "instruct") {
     const messagesContainer = chatElement.querySelector(".messages");
     const lastChild = messagesContainer?.lastElementChild;
     const prevSibling = lastChild?.previousElementSibling;
diff --git a/modules/html_generator.py b/modules/html_generator.py
index 67d15b6e..39659476 100644
--- a/modules/html_generator.py
+++ b/modules/html_generator.py
@@ -347,7 +347,7 @@ remove_button = f'<button class="footer-button footer-remove-button" title="Remo
 
 
 def generate_instruct_html(history):
-    output = f'<style>{instruct_css}</style><div class="chat" id="chat"><div class="messages">'
+    output = f'<style>{instruct_css}</style><div class="chat" id="chat" data-mode="instruct"><div class="messages">'
 
     for i in range(len(history['visible'])):
         row_visible = history['visible'][i]