diff --git a/pkg/shell/hosts_dialog.jsx b/pkg/shell/hosts_dialog.jsx
index b60d8ed89a6e..d2d72454e582 100644
--- a/pkg/shell/hosts_dialog.jsx
+++ b/pkg/shell/hosts_dialog.jsx
@@ -104,13 +104,6 @@ class NotSupported extends React.Component {
     }
 }
 
-export const CrossMachineWarning = () => {
-    return <Alert variant='warning'
-                  isInline
-                  isPlain
-                  title={_("Malicious pages on a remote machine may affect other connected hosts")} />;
-};
-
 class Connect extends React.Component {
     constructor(props) {
         super(props);
diff --git a/pkg/shell/indexes.jsx b/pkg/shell/indexes.jsx
index fd1b14aa6938..3c9441d2d1bc 100644
--- a/pkg/shell/indexes.jsx
+++ b/pkg/shell/indexes.jsx
@@ -189,10 +189,7 @@ function MachinesIndex(index_options, machines, loader) {
 
     function trigger_connection_flow(machine) {
         if (window.trigger_connection_flow) {
-            if (machine.state != "connected" && machine.state != "connecting") {
-                index.frames.remove(machine);
-                window.trigger_connection_flow(machine);
-            }
+            window.trigger_connection_flow(machine);
         }
     }