diff --git a/src/main.tsx b/src/main.tsx
index 8292305b..07c26f2e 100644
--- a/src/main.tsx
+++ b/src/main.tsx
@@ -340,7 +340,7 @@ class LineCmd extends React.Component<{sw : ScreenWindow, line : LineType, width
         let model = GlobalModel;
         let termWrap = sw.getTermWrap(line.cmdid);
         if (termWrap != null) {
-            termWrap.reloadTerminal(500);
+            termWrap.reload(500);
         }
     }
 
diff --git a/src/model.ts b/src/model.ts
index dac162d9..b45c359c 100644
--- a/src/model.ts
+++ b/src/model.ts
@@ -557,7 +557,7 @@ class ScreenWindow {
         if (line.contentheight != null && line.contentheight != -1) {
             usedRows = line.contentheight;
         }
-        let termContext = {sessionId: this.sessionId, screenId: this.screenId, windowId: this.windowId, cmdId: cmdId, lineNum: line.linenum};
+        let termContext = {sessionId: this.sessionId, screenId: this.screenId, windowId: this.windowId, cmdId: cmdId, lineId : line.lineid, lineNum: line.linenum};
         termWrap = new TermWrap(elem, {
             termContext: termContext,
             usedRows: usedRows,
@@ -1761,8 +1761,6 @@ class Model {
             let term = sw.getTermWrap(cmdId);
             if (term != null) {
                 term.setIsRunning(cmdStatusIsRunning(newStatus));
-                term.updateUsedRows(true, "cmd-status");
-                // setTimeout(() => term.updateUsedRows(true), 500);
             }
         }
     }
diff --git a/src/term.ts b/src/term.ts
index b4785d2f..0001af5c 100644
--- a/src/term.ts
+++ b/src/term.ts
@@ -109,7 +109,7 @@ class TermWrap {
         if (opts.customKeyHandler != null) {
             this.terminal.attachCustomKeyEventHandler((e) => opts.customKeyHandler(e, this));
         }
-        this.reloadTerminal(0);
+        this.reload(0);
     }
 
     @boundMethod
@@ -244,7 +244,7 @@ class TermWrap {
         return sprintf(GlobalModel.getBaseHostPort() + "/api/ptyout?sessionid=%s&cmdid=%s", termContext.sessionId, termContext.cmdId);
     }
 
-    reloadTerminal(delayMs : number) {
+    reload(delayMs : number) {
         if (this.terminal == null) {
             return;
         }
@@ -315,6 +315,7 @@ class TermWrap {
 
     setIsRunning(isRunning : boolean) {
         this.isRunning = isRunning;
+        this.updateUsedRows(true, "cmd-status");
     }
 }
 
diff --git a/src/types.ts b/src/types.ts
index 58c93c90..2fdf8734 100644
--- a/src/types.ts
+++ b/src/types.ts
@@ -338,6 +338,7 @@ type NormalTermContext = {
     screenId : string,
     windowId : string,
     cmdId : string,
+    lineId : string,
     lineNum : number,
 };