diff --git a/src/main.tsx b/src/main.tsx
index 89878cd4..34a0fe5b 100644
--- a/src/main.tsx
+++ b/src/main.tsx
@@ -508,9 +508,12 @@ class MarkdownRenderer extends React.Component<{sw : ScreenWindow, line : LineTy
 @mobxReact.observer
 class LineCmd extends React.Component<{sw : ScreenWindow, line : LineType, width : number, staticRender : boolean, visible : OV<boolean>, onHeightChange : HeightChangeCallbackType, collapsed : OV<boolean>, topBorder : boolean}, {}> {
     lineRef : React.RefObject<any> = React.createRef();
+    cmdTextRef : React.RefObject<any> = React.createRef();
     rtnStateDiff : mobx.IObservableValue<string> = mobx.observable.box(null, {name: "linecmd-rtn-state-diff"});
     rtnStateDiffFetched : boolean = false;
     lastHeight : number;
+    isOverflow : OV<boolean> = mobx.observable.box(false, {name: "line-overflow"});
+    isCmdExpanded : OV<boolean> = mobx.observable.box(false, {name: "cmd-expanded"});
     
     constructor(props) {
         super(props);
@@ -567,6 +570,7 @@ class LineCmd extends React.Component<{sw : ScreenWindow, line : LineType, width
 
     componentDidMount() {
         this.componentDidUpdate(null, null, null);
+        this.checkCmdText();
     }
 
     // FIXME
@@ -585,6 +589,13 @@ class LineCmd extends React.Component<{sw : ScreenWindow, line : LineType, width
         }
     }
 
+    @boundMethod
+    handleExpandCmd() : void {
+        mobx.action(() => {
+            this.isCmdExpanded.set(true);
+        })();
+    }
+
     renderCmdText(cmd : Cmd, remote : RemoteType) : any {
         if (cmd == null) {
             return (
@@ -593,11 +604,31 @@ class LineCmd extends React.Component<{sw : ScreenWindow, line : LineType, width
                 </div>
             );
         }
-        let remoteStr = getRemoteStr(cmd.remote);
-        let cwd = getCwdStr(remote, cmd.getRemoteFeState());
+        if (this.isCmdExpanded.get()) {
+            return (
+                <React.Fragment>
+                    <div key="meta2" className="meta meta-line2">
+                        <div className="metapart-mono cmdtext">
+                            <Prompt rptr={cmd.remote} festate={cmd.getRemoteFeState()}/>
+                        </div>
+                    </div>
+                    <div key="meta3" className="meta meta-line3 cmdtext-expanded-wrapper">
+                        <div className="cmdtext-expanded">{cmd.getFullCmdText()}</div>
+                    </div>
+                </React.Fragment>
+            );
+        }
+        let isMultiLine = cmd.isMultiLineCmdText();
         return (
-            <div className="metapart-mono cmdtext">
-                <Prompt rptr={cmd.remote} festate={cmd.getRemoteFeState()}/> {cmd.getSingleLineCmdText()}
+            <div key="meta2" className="meta meta-line2" ref={this.cmdTextRef}>
+                <div className="metapart-mono cmdtext">
+                    <Prompt rptr={cmd.remote} festate={cmd.getRemoteFeState()}/>
+                    <span> </span>
+                    <span>{cmd.getSingleLineCmdText()}</span>
+                </div>
+                <If condition={this.isOverflow.get() || isMultiLine}>
+                    <div className="cmdtext-overflow" onClick={this.handleExpandCmd}>...&#x25BC;</div>
+                </If>
             </div>
         );
     }
@@ -614,6 +645,28 @@ class LineCmd extends React.Component<{sw : ScreenWindow, line : LineType, width
     componentDidUpdate(prevProps, prevState, snapshot : {height : number}) : void {
         this.handleHeightChange();
         this.checkStateDiffLoad();
+        this.checkCmdText();
+    }
+
+    checkCmdText() {
+        let metaElem = this.cmdTextRef.current;
+        if (metaElem == null || metaElem.childNodes.length == 0) {
+            return;
+        }
+        let metaElemWidth = metaElem.offsetWidth;
+        let metaChild = metaElem.firstChild;
+        let children = metaChild.childNodes;
+        let childWidth = 0;
+        for (let i=0; i<children.length; i++) {
+            let ch = children[i];
+            childWidth += ch.offsetWidth;
+        }
+        let isOverflow = (childWidth > metaElemWidth);
+        if (isOverflow != this.isOverflow.get()) {
+            mobx.action(() => {
+                this.isOverflow.set(isOverflow);
+            })();
+        }
     }
 
     @boundMethod
@@ -719,6 +772,27 @@ class LineCmd extends React.Component<{sw : ScreenWindow, line : LineType, width
             </div>
         );
     }
+
+    renderMetaWrap(cmd : Cmd) {
+        let {line} = this.props;
+        let model = GlobalModel;
+        let formattedTime = getLineDateTimeStr(line.ts);
+        let termOpts = cmd.getTermOpts();
+        let remote = model.getRemote(cmd.remoteId);
+        return (
+            <div key="meta" className="meta-wrap">
+                <div key="meta1" className="meta meta-line1">
+                    <div className="ts">{formattedTime}</div>
+                    <div>&nbsp;</div>
+                    <div className="termopts">
+                        ({termOpts.rows}x{termOpts.cols})
+                        <If condition={cmd.isRunning() && false}><i onClick={this.handleResizeButton} className="resize-button fa fa-arrows-alt"/></If>
+                    </div>
+                </div>
+                {this.renderCmdText(cmd, remote)}
+            </div>
+        );
+    }
     
     render() {
         let {sw, line, width, staticRender, visible, topBorder} = this.props;
@@ -737,9 +811,7 @@ class LineCmd extends React.Component<{sw : ScreenWindow, line : LineType, width
                 </div>
             );
         }
-        let remote = model.getRemote(cmd.remoteId);
         let status = cmd.getStatus();
-        let termOpts = cmd.getTermOpts();
         let lineNumStr = (line.linenumtemp ? "~" : "") + String(line.linenum);
         let isSelected = mobx.computed(() => (sw.selectedLine.get() == line.linenum), {name: "computed-isSelected"}).get();
         let isPhysicalFocused = mobx.computed(() => sw.getIsFocused(line.linenum), {name: "computed-getIsFocused"}).get();
@@ -768,33 +840,19 @@ class LineCmd extends React.Component<{sw : ScreenWindow, line : LineType, width
         let RendererComponent : RendererComponentType = TerminalRenderer;
         if (line.renderer == "image") {
             RendererComponent = ImageRenderer;
-        }
-        
+        }        
         return (
             <div className={mainDivCn} id={"line-" + getLineId(line)}
                  ref={this.lineRef} onClick={this.handleClick}
                  data-lineid={line.lineid} data-linenum={line.linenum} data-windowid={line.windowid} data-cmdid={line.cmdid}>
                 <div key="focus" className={cn("focus-indicator", {"selected": isSelected}, {"active": isSelected && isFocused}, {"fg-focus": isFgFocused})}/>
-                <div key="header" className="line-header">
+                <div key="header" className={cn("line-header", {"is-expanded": this.isCmdExpanded.get()})}>
                     <LineAvatar line={line} cmd={cmd}/>
                     <div style={{display: "none"}} key="collapsed" className="collapsed-indicator" title={isCollapsed ? "output collapsed, click to show" : "click to hide output" } onClick={this.handleCollapsedClick}>
                         <If condition={isCollapsed}><i className="fa fa-caret-right"/></If>
                         <If condition={!isCollapsed}><i className="fa fa-caret-down"/></If>
                     </div>
-                    <div key="meta" className="meta-wrap">
-                        <div key="meta1" className="meta meta-line1">
-                            <div className="ts">{formattedTime}</div>
-                            <div>&nbsp;</div>
-                            <div className="termopts">
-                                ({termOpts.rows}x{termOpts.cols})
-                                <If condition={cmd.isRunning() && false}><i onClick={this.handleResizeButton} className="resize-button fa fa-arrows-alt"/></If>
-                            </div>
-                        </div>
-                        <div key="meta2" className="meta meta-line2">
-                            {this.renderCmdText(cmd, remote)}
-                        </div>
-                    </div>
-                    <div key="spacer" className="flex-spacer"/>
+                    {this.renderMetaWrap(cmd)}
                     <div key="pin" title="Pin" className={cn("line-icon", {"active": line.pinned})} onClick={this.clickPin} style={{display: "none"}}>
                         <i className="fa fa-thumb-tack"/>
                     </div>
@@ -2175,8 +2233,6 @@ class CmdInput extends React.Component<{}, {}> {
             remote = GlobalModel.getRemote(ri.remoteid);
             remoteState = ri.festate;
         }
-        let remoteStr = getRemoteStr(rptr);
-        let cwdStr = getCwdStr(remote, remoteState);
         let infoShow = inputModel.infoShow.get();
         let historyShow = !infoShow && inputModel.historyShow.get();
         let infoMsg = inputModel.infoMsg.get();
diff --git a/src/model.ts b/src/model.ts
index e877386f..4ecab9aa 100644
--- a/src/model.ts
+++ b/src/model.ts
@@ -190,6 +190,16 @@ class Cmd {
         return this.data.get().festate;
     }
 
+    isMultiLineCmdText() : boolean {
+        let cmdText = this.data.get().cmdstr;
+        if (cmdText == null) {
+            return "(none)";
+        }
+        cmdText = cmdText.trim();
+        let nlIdx = cmdText.indexOf("\n");
+        return (nlIdx != -1);
+    }
+
     getSingleLineCmdText() {
         let cmdText = this.data.get().cmdstr;
         if (cmdText == null) {
@@ -198,11 +208,17 @@ class Cmd {
         cmdText = cmdText.trim();
         let nlIdx = cmdText.indexOf("\n");
         if (nlIdx != -1) {
-            cmdText = cmdText.substr(0, nlIdx) + "...";
+            cmdText = cmdText.substr(0, nlIdx);
         }
-        if (cmdText.length > 80) {
-            cmdText = cmdText.substr(0, 77) + "...";
+        return cmdText;
+    }
+
+    getFullCmdText() {
+        let cmdText = this.data.get().cmdstr;
+        if (cmdText == null) {
+            return "(none)";
         }
+        cmdText = cmdText.trim();
         return cmdText;
     }
 
diff --git a/src/sh2.less b/src/sh2.less
index 204d8a9c..6b5b6dfb 100644
--- a/src/sh2.less
+++ b/src/sh2.less
@@ -714,9 +714,15 @@ body::-webkit-scrollbar {
         display: flex;
         flex-direction: row;
         height: 36px;
+        width: 100%;
+
+        &.is-expanded {
+            height: auto;
+        }
         
         .meta-wrap {
-            flex-grow: 1;
+            flex: 1 1 0px;
+            min-width: 0;
             display: flex;
             flex-direction: column;
             justify-content: center;
@@ -728,7 +734,8 @@ body::-webkit-scrollbar {
     }
 
     .line-icon {
-        display: none;
+        display: block;
+        visibility: hidden;
         cursor: pointer;
         padding: 3px;
         font-size: 1.5rem;
@@ -743,6 +750,7 @@ body::-webkit-scrollbar {
     }
 
     .line-icon.active {
+        visibility: visible;
         display: block;
 
         i.fa-star, i.fa-thumb-tack {
@@ -755,6 +763,7 @@ body::-webkit-scrollbar {
     }
 
     &:hover .line-icon {
+        visibility: visible;
         display: block;
     }
 
@@ -1035,7 +1044,7 @@ body::-webkit-scrollbar {
         flex-direction: row;
         font-size: 1rem;
         margin-top: -4px;
-        
+
         .user {
             color: lighten(@soft-blue, 10%);
             font-weight: bold;
@@ -1079,6 +1088,31 @@ body::-webkit-scrollbar {
             overflow: hidden;
             margin-left: 0;
         }
+
+        .cmdtext-overflow {
+            flex-shrink: 0;
+            padding-right: 2px;
+            color: white;
+            cursor: pointer;
+            .mono-font(16px);
+            margin-top: 4px;
+        }
+    }
+
+    .cmdtext-expanded-wrapper {
+        margin-top: 2px;
+        padding-left: 6px;
+        overflow-y: auto;
+        max-height: 54px;
+        border-left: 2px solid #333;
+        margin-left: 3px;
+
+        .cmdtext-expanded {
+            white-space: pre;
+            .mono-font(14px);
+            color: white;
+            padding-bottom: 5px;
+        }
     }
 }