diff --git a/src/main.tsx b/src/main.tsx
index 436ab9414..a89a4c57c 100644
--- a/src/main.tsx
+++ b/src/main.tsx
@@ -31,6 +31,8 @@ type OV<V> = mobx.IObservableValue<V>;
 type OArr<V> = mobx.IObservableArray<V>;
 type OMap<K,V> = mobx.ObservableMap<K,V>;
 
+type VisType = "visible" | "";
+
 type HeightChangeCallbackType = (lineNum : number, newHeight : number, oldHeight : number) => void;
 
 type RendererComponentProps = {sw : ScreenWindow, line : LineType, width : number, staticRender : boolean, visible : OV<boolean>, onHeightChange : HeightChangeCallbackType, collapsed : boolean};
@@ -687,17 +689,51 @@ class LineCmd extends React.Component<{sw : ScreenWindow, line : LineType, width
             this.props.collapsed.set(!isCollapsed);
         })();
     }
+
+    getLineDomId() : string {
+        let {line} = this.props;
+        return "line-" + getLineId(line);
+    }
+
+    renderSimple() {
+        let {sw, line, width, topBorder} = this.props;
+        let cmd = GlobalModel.getCmd(line);
+        let usedRows = sw.getUsedRows(line, cmd, width);
+        let mainDivCn = cn(
+            "line",
+            "line-cmd",
+            {"top-border": topBorder},
+        );
+        // header is 36px tall, padding+border = 6px
+        // zero-terminal is 0px
+        // terminal-wrapper overhead is 11px (margin/padding)
+        // each terminal line 16px
+        // inner-height, if zero-lines => 42
+        //               else: 53+(lines*16)
+        let height = 42; // height of zero height terminal
+        if (usedRows > 0) {
+            height = 53 + termHeightFromRows(usedRows);
+        }
+        return (
+            <div className={mainDivCn} id={this.getLineDomId()} ref={this.lineRef} data-lineid={line.lineid} data-linenum={line.linenum} data-windowid={line.windowid} style={{height: height}}>
+                <LineAvatar line={line} cmd={cmd}/>
+            </div>
+        );
+    }
     
     render() {
         let {sw, line, width, staticRender, visible, topBorder} = this.props;
         let model = GlobalModel;
         let lineid = line.lineid;
         let isVisible = visible.get();
+        if (staticRender || !isVisible) {
+            return this.renderSimple();
+        }
         let formattedTime = getLineDateTimeStr(line.ts);
         let cmd = model.getCmd(line);
         if (cmd == null) {
             return (
-                <div className="line line-invalid" id={"line-" + getLineId(line)} ref={this.lineRef} data-lineid={line.lineid} data-linenum={line.linenum} data-windowid={line.windowid}>
+                <div className="line line-invalid" id={this.getLineDomId()} ref={this.lineRef} data-lineid={line.lineid} data-linenum={line.linenum} data-windowid={line.windowid}>
                     [cmd not found '{line.cmdid}']
                 </div>
             );
@@ -734,6 +770,7 @@ class LineCmd extends React.Component<{sw : ScreenWindow, line : LineType, width
         if (line.renderer == "image") {
             RendererComponent = ImageRenderer;
         }
+        
         return (
             <div className={mainDivCn} id={"line-" + getLineId(line)}
                  ref={this.lineRef} onClick={this.handleClick}
diff --git a/src/model.ts b/src/model.ts
index 455b49ed2..a0f1956eb 100644
--- a/src/model.ts
+++ b/src/model.ts
@@ -602,6 +602,9 @@ class ScreenWindow {
     }
 
     getUsedRows(line : LineType, cmd : Cmd, width : number) : number {
+        if (cmd == null) {
+            return 0;
+        }
         let termOpts = cmd.getTermOpts();
         if (!termOpts.flexrows) {
             return termOpts.rows;
diff --git a/src/sh2.less b/src/sh2.less
index b849f9909..fae415071 100644
--- a/src/sh2.less
+++ b/src/sh2.less
@@ -700,11 +700,13 @@ body::-webkit-scrollbar {
     .avatar {
         cursor: pointer;
         margin-right: 10px;
+        height: 36px;
     }
 
     .line-header {
         display: flex;
         flex-direction: row;
+        height: 36px;
         
         .meta-wrap {
             flex-grow: 1;