diff --git a/desktop/flipper-ui-core/src/sandy-chrome/Navbar.tsx b/desktop/flipper-ui-core/src/sandy-chrome/Navbar.tsx
index 085113573..68039a7a6 100644
--- a/desktop/flipper-ui-core/src/sandy-chrome/Navbar.tsx
+++ b/desktop/flipper-ui-core/src/sandy-chrome/Navbar.tsx
@@ -503,14 +503,25 @@ function TroubleshootMenu({
             key="troubleshooting"
             title={<NavbarButton icon={BugOutlined} label="Troubleshoot" />}
             className={submenu}>
+            <Menu.Item
+              key="setupdoctor"
+              onClick={() => setIsDoctorVisible(true)}>
+              <Badge dot={hasNewProblem}>Setup Doctor</Badge>
+            </Menu.Item>
             {getRenderHostInstance().GK('flipper_connection_troubleshoot') && (
               <Menu.Item
                 key="connectivity"
                 onClick={() => setToplevelSelection('connectivity')}>
-                Troubleshoot connectivity
+                Troubleshoot Connectivity
               </Menu.Item>
             )}
             <TroubleshootingGuide />
+
+            <Menu.Item
+              key="rage"
+              onClick={exportEverythingEverywhereAllAtOnceTracked}>
+              Export All
+            </Menu.Item>
             <Menu.Item
               key="flipperlogs"
               onClick={() => setToplevelSelection('flipperlogs')}>
@@ -518,16 +529,6 @@ function TroubleshootMenu({
                 Flipper Logs
               </Badge>
             </Menu.Item>
-            <Menu.Item
-              key="setupdoctor"
-              onClick={() => setIsDoctorVisible(true)}>
-              <Badge dot={hasNewProblem}>Setup Doctor</Badge>
-            </Menu.Item>
-            <Menu.Item
-              key="rage"
-              onClick={exportEverythingEverywhereAllAtOnceTracked}>
-              Rage
-            </Menu.Item>
           </Menu.SubMenu>
         </Menu>
       </Badge>