diff --git a/desktop/app/src/chrome/SettingsSheet.tsx b/desktop/app/src/chrome/SettingsSheet.tsx
index d6f93de00..94758dbf0 100644
--- a/desktop/app/src/chrome/SettingsSheet.tsx
+++ b/desktop/app/src/chrome/SettingsSheet.tsx
@@ -29,8 +29,6 @@ import SandySettingsPanel from '../fb-stubs/SandySettingsPanel';
 import {reportUsage} from '../utils/metrics';
 import {Modal, message} from 'antd';
 import {Layout, withTrackingScope, _NuxManagerContext} from 'flipper-plugin';
-import GK from '../fb-stubs/GK';
-import ReleaseChannel from '../ReleaseChannel';
 
 const Container = styled(FlexColumn)({
   padding: 20,
@@ -143,8 +141,6 @@ class SettingsSheet extends Component<Props, State> {
       darkMode,
     } = this.state.updatedSettings;
 
-    const {releaseChannel} = this.state.updatedLauncherSettings;
-
     const {useSandy} = this.props;
 
     const settingsPristine =
@@ -280,22 +276,20 @@ class SettingsSheet extends Component<Props, State> {
             });
           }}
         />
-        {(GK.get('flipper_sandy') ||
-          releaseChannel == ReleaseChannel.INSIDERS) &&
-          !disableSandy && (
-            <ToggledSection
-              label="Enable dark theme (experimental)"
-              toggled={darkMode}
-              onChange={(enabled) => {
-                this.setState((prevState) => ({
-                  updatedSettings: {
-                    ...prevState.updatedSettings,
-                    darkMode: enabled,
-                  },
-                }));
-              }}
-            />
-          )}
+        {!disableSandy && (
+          <ToggledSection
+            label="Enable dark theme (experimental)"
+            toggled={darkMode}
+            onChange={(enabled) => {
+              this.setState((prevState) => ({
+                updatedSettings: {
+                  ...prevState.updatedSettings,
+                  darkMode: enabled,
+                },
+              }));
+            }}
+          />
+        )}
         <ToggledSection
           label="React Native keyboard shortcuts"
           toggled={reactNative.shortcuts.enabled}
diff --git a/desktop/app/src/fb-stubs/App.tsx b/desktop/app/src/fb-stubs/App.tsx
index 41c3fd923..e9dc5856f 100644
--- a/desktop/app/src/fb-stubs/App.tsx
+++ b/desktop/app/src/fb-stubs/App.tsx
@@ -14,6 +14,8 @@ import WarningEmployee from '../chrome/WarningEmployee';
 import fbConfig from '../fb-stubs/config';
 import {isFBEmployee} from '../utils/fbEmployee';
 import {Logger} from '../fb-interfaces/Logger';
+import isSandyEnabled from '../utils/isSandyEnabled';
+import {SandyApp} from '../sandy-chrome/SandyApp';
 
 type Props = {logger: Logger};
 
@@ -32,6 +34,8 @@ export default function App(props: Props) {
         setWarnEmployee(false);
       }}
     />
+  ) : isSandyEnabled() ? (
+    <SandyApp />
   ) : (
     <FlipperApp logger={props.logger} />
   );
diff --git a/desktop/app/src/fb-stubs/SandySettingsPanel.tsx b/desktop/app/src/fb-stubs/SandySettingsPanel.tsx
index d7d4a82b1..fa6b37145 100644
--- a/desktop/app/src/fb-stubs/SandySettingsPanel.tsx
+++ b/desktop/app/src/fb-stubs/SandySettingsPanel.tsx
@@ -7,9 +7,20 @@
  * @format
  */
 
-export default function (_props: {
+import React from 'react';
+import ToggledSection from '../chrome/settings/ToggledSection';
+import {ConfigText} from '../chrome/settings/configFields';
+
+export default function (props: {
   toggled: boolean;
   onChange: (value: boolean) => void;
 }) {
-  return null;
+  return (
+    <ToggledSection {...props} label="Disable Sandy UI">
+      {' '}
+      <ConfigText
+        content={'If disabled, Flipper will fall back to the classic design.'}
+      />
+    </ToggledSection>
+  );
 }
diff --git a/desktop/app/src/utils/isSandyEnabled.tsx b/desktop/app/src/utils/isSandyEnabled.tsx
index 5249c9ba4..b0a107297 100644
--- a/desktop/app/src/utils/isSandyEnabled.tsx
+++ b/desktop/app/src/utils/isSandyEnabled.tsx
@@ -7,15 +7,8 @@
  * @format
  */
 
-import config from '../fb-stubs/config';
-import GK from '../fb-stubs/GK';
-import ReleaseChannel from '../ReleaseChannel';
 import {store} from '../store';
 
 export default function isSandyEnabled() {
-  return (
-    (GK.get('flipper_sandy') ||
-      config.getReleaseChannel() === ReleaseChannel.INSIDERS) &&
-    !store.getState().settingsState.disableSandy
-  );
+  return !store.getState().settingsState.disableSandy;
 }