diff --git a/desktop/app/src/sandy-chrome/appinspect/AppSelector.tsx b/desktop/app/src/sandy-chrome/appinspect/AppSelector.tsx
index e8297db95..f6dcea450 100644
--- a/desktop/app/src/sandy-chrome/appinspect/AppSelector.tsx
+++ b/desktop/app/src/sandy-chrome/appinspect/AppSelector.tsx
@@ -83,34 +83,39 @@ export function AppSelector() {
   );
   const client = clients.find((client) => client.id === selectedApp);
 
-  return entries.length ? (
-    <Radio.Group
-      value={selectedApp}
-      size="small"
-      style={{
-        display: 'flex',
-        flex: 1,
-      }}>
-      <Dropdown
-        trigger={['click']}
-        overlay={
-          <Menu selectedKeys={selectedApp ? [selectedApp] : []}>{entries}</Menu>
-        }>
-        <AppInspectButton title="Select the device / app to inspect">
-          <Layout.Horizontal gap center>
-            <AppIcon appname={client?.query.app} device={selectedDevice} />
-            <Layout.Container grow shrink>
-              <Text strong>{client?.query.app ?? ''}</Text>
-              <Text>{selectedDevice?.title || 'Available devices'}</Text>
-            </Layout.Container>
-            <CaretDownOutlined />
-          </Layout.Horizontal>
-        </AppInspectButton>
-      </Dropdown>
-    </Radio.Group>
-  ) : (
-    // GK check to decide if troubleshooting guide will be visible or not
-    <TroubleshootingGuide showGuide={GK.get('flipper_self_sufficiency')} />
+  return (
+    <>
+      <Radio.Group
+        value={selectedApp}
+        size="small"
+        style={{
+          display: 'flex',
+          flex: 1,
+        }}>
+        <Dropdown
+          trigger={['click']}
+          overlay={
+            <Menu selectedKeys={selectedApp ? [selectedApp] : []}>
+              {entries}
+            </Menu>
+          }>
+          <AppInspectButton title="Select the device / app to inspect">
+            <Layout.Horizontal gap center>
+              <AppIcon appname={client?.query.app} device={selectedDevice} />
+              <Layout.Container grow shrink>
+                <Text strong>{client?.query.app ?? ''}</Text>
+                <Text>{selectedDevice?.title || 'Available devices'}</Text>
+              </Layout.Container>
+              <CaretDownOutlined />
+            </Layout.Horizontal>
+          </AppInspectButton>
+        </Dropdown>
+      </Radio.Group>
+      <TroubleshootingGuide
+        showGuide={GK.get('flipper_self_sufficiency')}
+        devicesDetected={entries.length}
+      />
+    </>
   );
 }
 
diff --git a/desktop/app/src/sandy-chrome/appinspect/fb-stubs/TroubleshootingGuide.tsx b/desktop/app/src/sandy-chrome/appinspect/fb-stubs/TroubleshootingGuide.tsx
index 0c624dd00..0ed5a8ee6 100644
--- a/desktop/app/src/sandy-chrome/appinspect/fb-stubs/TroubleshootingGuide.tsx
+++ b/desktop/app/src/sandy-chrome/appinspect/fb-stubs/TroubleshootingGuide.tsx
@@ -10,6 +10,12 @@
 import React from 'react';
 import {NoDevices} from '../NoDevices';
 
-export function TroubleshootingGuide(_props: {showGuide: boolean}) {
-  return <NoDevices />;
+export function TroubleshootingGuide(_props: {
+  showGuide: boolean;
+  devicesDetected: number;
+}) {
+  if (_props.devicesDetected == 0) return <NoDevices />;
+  else {
+    return <></>;
+  }
 }