2 files changed, 9 insertions, 2 deletions
diff --git a/gui/src/renderer/components/Connect.tsx b/gui/src/renderer/components/Connect.tsx
index 4acab681bc..b57c63a273 100644
--- a/gui/src/renderer/components/Connect.tsx
+++ b/gui/src/renderer/components/Connect.tsx
@@ -18,6 +18,7 @@ interface IProps {
   connection: IConnectionReduxState;
   loginState: LoginState;
   accountExpiry?: AccountExpiry;
+  blockWhenDisconnected: boolean;
   selectedRelayName: string;
   onSettings: () => void;
   onSelectLocation: () => void;
@@ -156,6 +157,7 @@ export default class Connect extends Component<IProps, IState> {
 
           <TunnelControl
             tunnelState={this.props.connection.status}
+            blockWhenDisconnected={this.props.blockWhenDisconnected}
             selectedRelayName={this.props.selectedRelayName}
             city={this.props.connection.city}
             country={this.props.connection.country}
diff --git a/gui/src/renderer/components/TunnelControl.tsx b/gui/src/renderer/components/TunnelControl.tsx
index 5bf00fb9fa..aa8ae80183 100644
--- a/gui/src/renderer/components/TunnelControl.tsx
+++ b/gui/src/renderer/components/TunnelControl.tsx
@@ -13,6 +13,7 @@ import SecuredLabel, { SecuredDisplayStyle } from './SecuredLabel';
 
 interface ITunnelControlProps {
   tunnelState: TunnelState;
+  blockWhenDisconnected: boolean;
   selectedRelayName: string;
   city?: string;
   country?: string;
@@ -224,11 +225,14 @@ export default class TunnelControl extends Component<ITunnelControlProps> {
           </Wrapper>
         );
 
-      case 'disconnected':
+      case 'disconnected': {
+        const displayStyle = this.props.blockWhenDisconnected
+          ? SecuredDisplayStyle.blocked
+          : SecuredDisplayStyle.unsecured;
         return (
           <Wrapper>
             <Body>
-              <Secured displayStyle={SecuredDisplayStyle.unsecured} />
+              <Secured displayStyle={displayStyle} />
               <Location>{this.renderCountry()}</Location>
             </Body>
             <Footer>
@@ -237,6 +241,7 @@ export default class TunnelControl extends Component<ITunnelControlProps> {
             </Footer>
           </Wrapper>
         );
+      }
 
       default:
         throw new Error(`Unknown TunnelState: ${this.props.tunnelState}`);