diff --git a/src/app/common/themes/themes.less b/src/app/common/themes/themes.less
index ea46f77c8..f946351a3 100644
--- a/src/app/common/themes/themes.less
+++ b/src/app/common/themes/themes.less
@@ -15,6 +15,7 @@
 @button-disabled-background: rgb(30, 29, 29);
 @success-green: rgb(38, 97, 26);
 @error-red: #cc0000;
+@error-red-brightened: #ff8888;
 @warning-yellow: #ffa500;
 @textarea-background: #171717;
 
diff --git a/src/app/line/line.less b/src/app/line/line.less
index 4e60f521d..2d5ed31cd 100644
--- a/src/app/line/line.less
+++ b/src/app/line/line.less
@@ -35,13 +35,22 @@
     }
 
     &.selected {
-        // border: 1px solid rgba(@base-color, 0.8) !important;
+        .line-mask {
+            border-left: 4px solid #ccc;
+        }
+
+        &.has-error {
+            .line-mask {
+                border-left: 4px solid rgba(@error-red-brightened, 0.8);
+            }
+        }
     }
 
-    &.active {
+    &.active.selected {
         .line-mask {
             background-color: rgba(255, 255, 255, 0.1);
             border: 2px solid rgba(@wave-green, 0.8);
+            border-left: 4px solid rgba(@wave-green, 0.8);
         }
 
         &.has-error {
diff --git a/src/app/line/linecomps.tsx b/src/app/line/linecomps.tsx
index 30865ec11..11ddd661e 100644
--- a/src/app/line/linecomps.tsx
+++ b/src/app/line/linecomps.tsx
@@ -669,7 +669,7 @@ class LineCmd extends React.Component<
                 data-linenum={line.linenum}
                 data-screenid={line.screenid}
             >
-                <If condition={(isSelected && isFocused) || cmdError}>
+                <If condition={isSelected || cmdError}>
                     <div key="mask" className={cn("line-mask", { "error-mask": cmdError })}></div>
                 </If>
                 <div