diff --git a/desktop/flipper-common/src/doctor.tsx b/desktop/flipper-common/src/doctor.tsx
index ce7fce328b4..e4ac0e05a64 100644
--- a/desktop/flipper-common/src/doctor.tsx
+++ b/desktop/flipper-common/src/doctor.tsx
@@ -170,7 +170,12 @@ export namespace FlipperDoctor {
     'ios.xcode-select--not_set': [{message: string}];
     'ios.xcode-select--no_xcode_selected': [];
     'ios.xcode-select--noop': [];
-    'ios.xcode-select--custom_path': [];
+    'ios.xcode-select--custom_path': [
+      {
+        selectedPath: string;
+        availableXcode: string | null;
+      },
+    ];
     'ios.xcode-select--old_version_selected': [
       {
         selectedVersion: string;
diff --git a/desktop/flipper-ui/src/sandy-chrome/doctor/index.tsx b/desktop/flipper-ui/src/sandy-chrome/doctor/index.tsx
index db881099e2f..898794b679a 100644
--- a/desktop/flipper-ui/src/sandy-chrome/doctor/index.tsx
+++ b/desktop/flipper-ui/src/sandy-chrome/doctor/index.tsx
@@ -187,6 +187,19 @@ const XcodeSelectNoXcode = (
   </Typography.Paragraph>
 );
 
+const XcodeSelectCustomPath = (
+  props: PropsFor<'ios.xcode-select--custom_path'>,
+) => (
+  <Typography.Paragraph>
+    Selected path is not a Xcode application:
+    <CodeBlock size="s">{props.selectedPath}</CodeBlock>
+    <CliCommand
+      title="Select existing Xcode application"
+      command={`sudo xcode-select -switch ${props.availableXcode ?? '<path/to/>/Xcode.app'}`}
+    />
+  </Typography.Paragraph>
+);
+
 const XcodeSelectNonExistingSelected = (
   props: PropsFor<'ios.xcode-select--nonexisting_selected'>,
 ) => (
@@ -335,7 +348,7 @@ const messageToComp: {
   'ios.xcode-select--no_xcode_selected': XcodeSelectNoXcode,
   'ios.xcode-select--nonexisting_selected': XcodeSelectNonExistingSelected,
   'ios.xcode-select--noop': Noop,
-  'ios.xcode-select--custom_path': Noop,
+  'ios.xcode-select--custom_path': XcodeSelectCustomPath,
   'ios.xcode-select--old_version_selected': Noop,
 
   'ios.sdk--installed': IosSdkInstalled,