diff --git a/client/components/NetworkLobby.vue b/client/components/NetworkLobby.vue
index 318cee9a..fa14575e 100644
--- a/client/components/NetworkLobby.vue
+++ b/client/components/NetworkLobby.vue
@@ -22,12 +22,14 @@
 				class="name"
 			>{{ channel.name }}</span>
 			<span
+				v-if="network.status.connected && !network.status.secure"
 				class="not-secure-tooltip tooltipped tooltipped-w"
 				aria-label="Insecure connection"
 			>
 				<span class="not-secure-icon" />
 			</span>
 			<span
+				v-if="!network.status.connected"
 				class="not-connected-tooltip tooltipped tooltipped-w"
 				aria-label="Disconnected"
 			>
diff --git a/client/css/style.css b/client/css/style.css
index 1ba24095..133c420b 100644
--- a/client/css/style.css
+++ b/client/css/style.css
@@ -661,21 +661,6 @@ background on hover (unless active) */
 	color: #c0f8c3;
 }
 
-#sidebar .not-connected-tooltip,
-#sidebar .not-secure-tooltip {
-	display: none;
-}
-
-#sidebar .not-connected .not-connected-tooltip,
-#sidebar .not-secure .not-secure-tooltip {
-	display: inline-block;
-}
-
-#sidebar .not-connected .not-secure-tooltip {
-	/* Do not display insecure icon if disconnected */
-	display: none;
-}
-
 #sidebar .not-connected-tooltip,
 #sidebar .not-secure-tooltip,
 #sidebar .parted-channel-tooltip {