diff --git a/src/main/resources/static/js/gw.process.js b/src/main/resources/static/js/gw.process.js
index 160b5bcd..4401e5f7 100644
--- a/src/main/resources/static/js/gw.process.js
+++ b/src/main/resources/static/js/gw.process.js
@@ -961,6 +961,10 @@ GW.process = {
   },
 
   displayOutput: function (msg) {
+    
+    // make sure the current history id is updated
+    GW.process.history_id = msg.hid
+
     var output = GW.general.escapeCodeforHTML(msg.output);
 
     if (msg.output == "logfile") {
@@ -1310,6 +1314,8 @@ GW.process = {
 
     GW.ssh.process_output_id = "process-log-window";
 
+    GW.process.history_id = null;
+
     msg = GW.general.parseResponse(msg);
 
     code_type = msg.lang == null ? msg.description : msg.lang;