diff --git a/src/main.tsx b/src/main.tsx
index c407b937..ad70bd4c 100644
--- a/src/main.tsx
+++ b/src/main.tsx
@@ -138,10 +138,13 @@ function getLineDateStr(ts : number) : string {
 @mobxReact.observer
 class LineText extends React.Component<{sw : ScreenWindow, line : LineType}, {}> {
     render() {
-        let line = this.props.line;
+        let {sw, line} = this.props;
         let formattedTime = getLineDateStr(line.ts);
+        let isSelected = (sw.selectedLine.get() == line.linenum);
+        let isFocused = (sw.focusType.get() == "lines");
         return (
             <div className="line line-text" data-lineid={line.lineid} data-linenum={line.linenum} data-windowid={line.windowid}>
+                <div className={cn("focus-indicator", {"selected": isSelected}, {"active": isSelected && isFocused})}/>
                 <div className="avatar">
                     S
                 </div>
diff --git a/src/model.ts b/src/model.ts
index 863e9b6b..562e9ffa 100644
--- a/src/model.ts
+++ b/src/model.ts
@@ -1424,10 +1424,18 @@ class Model {
     }
 
     onICmd(e : any, mods : KeyModsType) {
+        let sw = this.getActiveSW();
+        if (sw != null) {
+            sw.setFocusType("input");
+        }
         this.inputModel.giveFocus();
     }
 
     onLCmd(e : any, mods : KeyModsType) {
+        let sw = this.getActiveSW();
+        if (sw != null) {
+            sw.setFocusType("lines");
+        }
         // this.inputModel.giveCmdFocus();
     }