diff --git a/aiserver.py b/aiserver.py
index 89d7a5fe..4b984bcc 100644
--- a/aiserver.py
+++ b/aiserver.py
@@ -846,9 +846,11 @@ def actionsubmit(data, actionmode=0):
             # Clear the startup text from game screen
             emit('from_server', {'cmd': 'updatescreen', 'gamestarted': vars.gamestarted, 'data': 'Please wait, generating story...'}, broadcast=True)
             calcsubmit(data) # Run the first action through the generator
+            emit('from_server', {'cmd': 'scrolldown', 'data': ''}, broadcast=True)
         else:
             refresh_story()
             set_aibusy(0)
+            emit('from_server', {'cmd': 'scrolldown', 'data': ''}, broadcast=True)
     else:
         # Dont append submission if it's a blank/continue action
         if(data != ""):
@@ -861,9 +863,11 @@ def actionsubmit(data, actionmode=0):
         if(not vars.noai):
             # Off to the tokenizer!
             calcsubmit(data)
+            emit('from_server', {'cmd': 'scrolldown', 'data': ''}, broadcast=True)
         else:
             refresh_story()
             set_aibusy(0)
+            emit('from_server', {'cmd': 'scrolldown', 'data': ''}, broadcast=True)
 
 #==================================================================#
 #  
diff --git a/static/application.js b/static/application.js
index 6695ec0f..02b15d15 100644
--- a/static/application.js
+++ b/static/application.js
@@ -850,6 +850,10 @@ $(document).ready(function(){
 				}, 5);
 			}
 			newly_loaded = false;
+		} else if(msg.cmd == "scrolldown") {
+			setTimeout(function () {
+				$('#gamescreen').animate({scrollTop: $('#gamescreen').prop('scrollHeight')}, 1000);
+			}, 5);
 		} else if(msg.cmd == "setgamestate") {
 			// Enable or Disable buttons
 			if(msg.data == "ready") {