diff --git a/src/app/common/common.less b/src/app/common/common.less
index 0eece252..afd60e82 100644
--- a/src/app/common/common.less
+++ b/src/app/common/common.less
@@ -992,6 +992,26 @@
         }
     }
 
+    &.color-yellow {
+        &.solid {
+            border-color: @warning-yellow;
+            background-color: mix(@warning-yellow, @term-white, 50%);
+            box-shadow: none;
+        }
+
+        &.outlined {
+            color: @warning-yellow;
+            border-color: @warning-yellow;
+            &:hover {
+                color: @term-white;
+                border-color: @term-white;
+            }
+        }
+
+        &.ghost {
+        }
+    }
+
     &.color-red {
         &.solid {
             border-color: @term-red;
diff --git a/src/app/common/common.tsx b/src/app/common/common.tsx
index 5afeb980..a328049e 100644
--- a/src/app/common/common.tsx
+++ b/src/app/common/common.tsx
@@ -229,6 +229,7 @@ interface ButtonProps {
     leftIcon?: React.ReactNode;
     rightIcon?: React.ReactNode;
     color?: string;
+    style?: React.CSSProperties;
 }
 
 class Button extends React.Component<ButtonProps> {
@@ -236,6 +237,7 @@ class Button extends React.Component<ButtonProps> {
         theme: "primary",
         variant: "solid",
         color: "",
+        style: {},
     };
 
     @boundMethod
@@ -246,13 +248,14 @@ class Button extends React.Component<ButtonProps> {
     }
 
     render() {
-        const { leftIcon, rightIcon, theme, children, disabled, variant, color } = this.props;
+        const { leftIcon, rightIcon, theme, children, disabled, variant, color, style } = this.props;
 
         return (
             <button
                 className={cn("wave-button", theme, variant, color, { disabled: disabled })}
                 onClick={this.handleClick}
                 disabled={disabled}
+                style={style}
             >
                 {leftIcon && <span className="icon-left">{leftIcon}</span>}
                 {children}
diff --git a/src/app/workspace/cmdinput/cmdinput.less b/src/app/workspace/cmdinput/cmdinput.less
index 1d888853..7324b86e 100644
--- a/src/app/workspace/cmdinput/cmdinput.less
+++ b/src/app/workspace/cmdinput/cmdinput.less
@@ -73,6 +73,42 @@
     .cmd-input-context {
         color: #fff;
         white-space: nowrap;
+        display: flex;
+        justify-content: space-between;
+        align-items: center;
+    }
+
+    .cmd-input-filter {
+        opacity: 0.5;
+        &:hover {
+            opacity: 1.0;
+        }
+
+        .avatar {
+            display: inline-block;
+            width: 1em;
+            height: 1em;
+            margin: 0 0.5em;
+            vertical-align: text-top;
+            fill: @base-color;
+        }
+
+        .warning {
+            fill: @warning-yellow;
+        }
+
+        @keyframes infiniteRotate {
+            0% {
+                transform: rotate(0deg);
+            }
+            100% {
+                transform: rotate(360deg);
+            }
+        }
+
+        .spin {
+            animation: infiniteRotate 2s linear infinite;
+        }
     }
 
     .cmd-input-field {
diff --git a/src/app/workspace/cmdinput/cmdinput.tsx b/src/app/workspace/cmdinput/cmdinput.tsx
index 2891d81b..e6a94d3e 100644
--- a/src/app/workspace/cmdinput/cmdinput.tsx
+++ b/src/app/workspace/cmdinput/cmdinput.tsx
@@ -5,18 +5,19 @@ import * as React from "react";
 import * as mobxReact from "mobx-react";
 import * as mobx from "mobx";
 import { boundMethod } from "autobind-decorator";
-import { If } from "tsx-control-statements/components";
+import { If, Choose, When, Otherwise } from "tsx-control-statements/components";
 import cn from "classnames";
 import dayjs from "dayjs";
 import type { RemoteType, RemoteInstanceType, RemotePtrType } from "../../../types/types";
 import localizedFormat from "dayjs/plugin/localizedFormat";
-import { GlobalModel, GlobalCommandRunner } from "../../../model/model";
-import { renderCmdText } from "../../common/common";
+import { GlobalModel, GlobalCommandRunner, Screen, ScreenLines } from "../../../model/model";
+import { renderCmdText, Button } from "../../common/common";
 import { TextAreaInput } from "./textareainput";
 import { InfoMsg } from "./infomsg";
 import { HistoryInfo } from "./historyinfo";
 import { Prompt } from "../../common/prompt/prompt";
 import { ReactComponent as ExecIcon } from "../../assets/icons/exec.svg";
+import { ReactComponent as RotateIcon } from "../../assets/icons/line/rotate.svg";
 import "./cmdinput.less";
 
 dayjs.extend(localizedFormat);
@@ -90,6 +91,13 @@ class CmdInput extends React.Component<{}, {}> {
         GlobalCommandRunner.connectRemote(remoteId);
     }
 
+    @boundMethod
+    toggleFilter(screen: Screen) {
+        mobx.action(() => {
+            screen.filterRunning.set(!screen.filterRunning.get());
+        })();
+    }
+
     render() {
         let model = GlobalModel;
         let inputModel = model.inputModel;
@@ -113,6 +121,8 @@ class CmdInput extends React.Component<{}, {}> {
         let focusVal = inputModel.physicalInputFocused.get();
         let inputMode: string = inputModel.inputMode.get();
         let textAreaInputKey = screen == null ? "null" : screen.screenId;
+        let win = GlobalModel.getScreenLinesById(screen.screenId) ?? GlobalModel.loadScreenLines(screen.screenId);
+        let numRunningLines = win.getRunningCmdLines().length;
         return (
             <div
                 ref={this.cmdInputRef}
@@ -142,6 +152,14 @@ class CmdInput extends React.Component<{}, {}> {
                     <div className="has-text-white">
                         <span ref={this.promptRef}><Prompt rptr={rptr} festate={feState} /></span>
                     </div>
+                    <If condition={numRunningLines > 0}>
+                        <div onClick={() => this.toggleFilter(screen)}className="cmd-input-filter">
+                            {numRunningLines}
+                            <div className="avatar">
+                                <RotateIcon className="warning spin" />
+                            </div>
+                        </div>
+                    </If>
                 </div>
                 <div
                     key="input"
diff --git a/src/app/workspace/screen/screenview.less b/src/app/workspace/screen/screenview.less
index 60fd7236..38d3346e 100644
--- a/src/app/workspace/screen/screenview.less
+++ b/src/app/workspace/screen/screenview.less
@@ -98,6 +98,11 @@
                 }
             }
         }
+
+        .filter-running {
+            margin: auto 1rem 0 1rem;
+            align-self: center;
+        }
     }
 
     .screen-settings-inline {
diff --git a/src/app/workspace/screen/screenview.tsx b/src/app/workspace/screen/screenview.tsx
index dcdbeedb..0588f27d 100644
--- a/src/app/workspace/screen/screenview.tsx
+++ b/src/app/workspace/screen/screenview.tsx
@@ -14,7 +14,7 @@ import { GlobalCommandRunner, TabColors, TabIcons } from "../../../model/model";
 import type { LineType, RenderModeType, LineFactoryProps, CommandRtnType } from "../../../types/types";
 import * as T from "../../../types/types";
 import localizedFormat from "dayjs/plugin/localizedFormat";
-import { InlineSettingsTextEdit, RemoteStatusLight } from "../../common/common";
+import { InlineSettingsTextEdit, RemoteStatusLight, Button } from "../../common/common";
 import { getRemoteStr } from "../../common/prompt/prompt";
 import { GlobalModel, ScreenLines, Screen, Session } from "../../../model/model";
 import { Line } from "../../line/linecomps";
@@ -334,6 +334,22 @@ class ScreenWindowView extends React.Component<{ session: Session; screen: Scree
         return <Line key={realLine.lineid} screen={screen} line={realLine} {...restProps} />;
     }
 
+    determineVisibleLines(win: ScreenLines): LineType[] {
+        let { screen } = this.props;
+        if (screen.filterRunning.get()) {
+            return win.getRunningCmdLines();
+        }
+        return win.getNonArchivedLines();
+    }
+
+    @boundMethod
+    disableFilter() {
+        let { screen } = this.props;
+        mobx.action(() => {
+            screen.filterRunning.set(false);
+        })();
+    }
+
     render() {
         let { session, screen } = this.props;
         let win = this.getScreenLines();
@@ -351,7 +367,7 @@ class ScreenWindowView extends React.Component<{ session: Session; screen: Scree
             return this.renderError("loading client data", true);
         }
         let isActive = screen.isActive();
-        let lines = win.getNonArchivedLines();
+        let lines = this.determineVisibleLines(win);
         let renderMode = this.renderMode.get();
         return (
             <div className="window-view" ref={this.windowViewRef}>
@@ -374,7 +390,7 @@ class ScreenWindowView extends React.Component<{ session: Session; screen: Scree
                         <NewTabSettings screen={screen} />
                     </If>
                     <If condition={screen.nextLineNum.get() != 1}>
-                        <div className="window-view" ref={this.windowViewRef} data-screenid={screen.screenId}>
+                        <div className="window-empty" ref={this.windowViewRef} data-screenid={screen.screenId}>
                             <div key="lines" className="lines"></div>
                             <div key="window-empty" className={cn("window-empty")}>
                                 <div>
@@ -422,6 +438,19 @@ class ScreenWindowView extends React.Component<{ session: Session; screen: Scree
                         lineFactory={this.buildLineComponent}
                     />
                 </If>
+                <If condition={screen.filterRunning.get()}>
+                    <div className='filter-running'>
+                        <Button
+                          variant="outlined"
+                          color="color-yellow"
+                          style={{borderRadius: '999px'}}
+                          onClick={this.disableFilter}
+                        >
+                            Showing Running Commands &nbsp;
+                            <i className="fa-sharp fa-solid fa-xmark" />
+                        </Button>
+                    </div>
+                </If>
             </div>
         );
     }
diff --git a/src/model/model.ts b/src/model/model.ts
index f2c145ac..271c7ffc 100644
--- a/src/model/model.ts
+++ b/src/model/model.ts
@@ -357,6 +357,7 @@ class Screen {
     renderers: Record<string, RendererModel> = {}; // lineid => RendererModel
     shareMode: OV<string>;
     webShareOpts: OV<WebShareOpts>;
+    filterRunning: OV<boolean>;
 
     constructor(sdata: ScreenDataType) {
         this.sessionId = sdata.sessionid;
@@ -393,6 +394,9 @@ class Screen {
         this.webShareOpts = mobx.observable.box(sdata.webshareopts, {
             name: "screen-webShareOpts",
         });
+        this.filterRunning = mobx.observable.box(false, {
+            name: "screen-filter-running",
+        })
     }
 
     dispose() {}