diff --git a/ui/src/components/BeamlineActions/AnnotatedBeamlineActionDialog.jsx b/ui/src/components/BeamlineActions/AnnotatedBeamlineActionDialog.jsx
index d53d5db46..f9ebe5eae 100644
--- a/ui/src/components/BeamlineActions/AnnotatedBeamlineActionDialog.jsx
+++ b/ui/src/components/BeamlineActions/AnnotatedBeamlineActionDialog.jsx
@@ -48,67 +48,63 @@ export default function AnnotatedBeamlineActionDialog(props) {
       </Button>
     );
   }
-
-  if (isDialogVisble) {
-    return (
-      <DraggableModal
-        id="beamlineActionOutput"
-        show={isDialogVisble}
-        onHide={handleOnHide}
-        defaultpos={defaultPosition}
-      >
-        <Modal.Header>
-          <Modal.Title>{actionName}</Modal.Title>
-        </Modal.Header>
-        <Modal.Body>
-          <Row className="py-2">
-            <Col className="col-md-4">
-              <div className={style.json_schema_form_container_with_submit}>
-                <JSForm
-                  liveValidate
-                  validator={validator}
-                  schema={JSON.parse(actionSchema)}
-                  onSubmit={({ formData }) => {
-                    handleStartAction(actionId, formData);
-                  }}
-                >
-                  {getRunButton(isActionRunning)}
-                </JSForm>
-              </div>
-            </Col>
-            <Row className="py-2" />
-          </Row>
-          <Row className="py-2">
-            <Col>
-              <Plot1D
-                displayedPlotCallback={handleOnPlotDisplay}
-                plotId={plotId}
-                autoNext={isActionRunning}
-              />
-              {actionMessages.length > 0 ? (
-                <Card>
-                  {actionMessages.map((message) => (
-                    // eslint-disable-next-line react/jsx-key
-                    <p>{message.message}</p>
-                  ))}
-                </Card>
-              ) : (
-                ''
-              )}
-            </Col>
-          </Row>
-        </Modal.Body>
-        <Modal.Footer>
-          <Button
-            variant="outline-secondary"
-            onClick={handleOnHide}
-            disabled={isActionRunning}
-          >
-            Close window
-          </Button>
-        </Modal.Footer>
-      </DraggableModal>
-    );
-  }
-  return null;
+  return (
+    <DraggableModal
+      id="beamlineActionOutput"
+      show={isDialogVisble}
+      onHide={handleOnHide}
+      defaultpos={defaultPosition}
+    >
+      <Modal.Header>
+        <Modal.Title>{actionName}</Modal.Title>
+      </Modal.Header>
+      <Modal.Body>
+        <Row className="py-2">
+          <Col className="col-md-4">
+            <div className={style.json_schema_form_container_with_submit}>
+              <JSForm
+                liveValidate
+                validator={validator}
+                schema={JSON.parse(actionSchema)}
+                onSubmit={({ formData }) => {
+                  handleStartAction(actionId, formData);
+                }}
+              >
+                {getRunButton(isActionRunning)}
+              </JSForm>
+            </div>
+          </Col>
+          <Row className="py-2" />
+        </Row>
+        <Row className="py-2">
+          <Col>
+            <Plot1D
+              displayedPlotCallback={handleOnPlotDisplay}
+              plotId={plotId}
+              autoNext={isActionRunning}
+            />
+            {actionMessages.length > 0 ? (
+              <Card>
+                {actionMessages.map((message) => (
+                  // eslint-disable-next-line react/jsx-key
+                  <p>{message.message}</p>
+                ))}
+              </Card>
+            ) : (
+              ''
+            )}
+          </Col>
+        </Row>
+      </Modal.Body>
+      <Modal.Footer>
+        <Button
+          variant="outline-secondary"
+          onClick={handleOnHide}
+          disabled={isActionRunning}
+        >
+          Close window
+        </Button>
+      </Modal.Footer>
+    </DraggableModal>
+  );
 }
diff --git a/ui/src/containers/BeamlineActionsContainer.jsx b/ui/src/containers/BeamlineActionsContainer.jsx
index f67f17f01..2aa0e9037 100644
--- a/ui/src/containers/BeamlineActionsContainer.jsx
+++ b/ui/src/containers/BeamlineActionsContainer.jsx
@@ -130,7 +130,8 @@ class BeamlineActionsContainer extends React.Component {
             handleOnPlotDisplay={this.newPlotDisplayed}
             plotId={this.plotIdByAction[currentActionName]}
           />
-        ) : (
+        ) : null}
+        {this.props.currentAction.argument_type === 'JSONSchema' ? (
           <AnnotatedBeamlineActionDialog
             isDialogVisble={this.props.currentAction.show}
             handleOnHide={this.hideOutput}
@@ -146,7 +147,7 @@ class BeamlineActionsContainer extends React.Component {
             handleOnPlotDisplay={this.newPlotDisplayed}
             plotId={this.plotIdByAction[currentActionName]}
           />
-        )}
+        ) : null}
       </>
     );
   }