diff --git a/superset-frontend/packages/superset-ui-chart-controls/src/index.ts b/superset-frontend/packages/superset-ui-chart-controls/src/index.ts
index 962d9ac0ab670..7c57a3e1709ad 100644
--- a/superset-frontend/packages/superset-ui-chart-controls/src/index.ts
+++ b/superset-frontend/packages/superset-ui-chart-controls/src/index.ts
@@ -30,12 +30,6 @@ export * from './components/ColumnOption';
 export * from './components/ColumnTypeLabel/ColumnTypeLabel';
 export * from './components/MetricOption';
 
-// React control components
-export { default as sharedControls, withDndFallback } from './shared-controls';
-export { default as sharedControlComponents } from './shared-controls/components';
-export { legacySortBy } from './shared-controls/legacySortBy';
-export * from './shared-controls/emitFilterControl';
-export * from './shared-controls/components';
+export * from './shared-controls';
 export * from './types';
-export * from './shared-controls/mixins';
 export * from './fixtures';
diff --git a/superset-frontend/packages/superset-ui-chart-controls/src/sections/echartsTimeSeriesQuery.tsx b/superset-frontend/packages/superset-ui-chart-controls/src/sections/echartsTimeSeriesQuery.tsx
index 9d1c52433fb34..4fbf9ee764e29 100644
--- a/superset-frontend/packages/superset-ui-chart-controls/src/sections/echartsTimeSeriesQuery.tsx
+++ b/superset-frontend/packages/superset-ui-chart-controls/src/sections/echartsTimeSeriesQuery.tsx
@@ -18,7 +18,7 @@
  */
 import { ContributionType, hasGenericChartAxes, t } from '@superset-ui/core';
 import { ControlPanelSectionConfig } from '../types';
-import { emitFilterControl } from '../shared-controls/emitFilterControl';
+import { emitFilterControl } from '../shared-controls';
 
 export const echartsTimeSeriesQuery: ControlPanelSectionConfig = {
   label: t('Query'),
diff --git a/superset-frontend/packages/superset-ui-chart-controls/src/shared-controls/emitFilterControl.tsx b/superset-frontend/packages/superset-ui-chart-controls/src/shared-controls/customControls.tsx
similarity index 89%
rename from superset-frontend/packages/superset-ui-chart-controls/src/shared-controls/emitFilterControl.tsx
rename to superset-frontend/packages/superset-ui-chart-controls/src/shared-controls/customControls.tsx
index a4c3f4a86d8af..44773cf5d1cf6 100644
--- a/superset-frontend/packages/superset-ui-chart-controls/src/shared-controls/emitFilterControl.tsx
+++ b/superset-frontend/packages/superset-ui-chart-controls/src/shared-controls/customControls.tsx
@@ -19,9 +19,9 @@
 
 import { FeatureFlag, isFeatureEnabled, t } from '@superset-ui/core';
 
-const enableCrossFilter = isFeatureEnabled(FeatureFlag.DASHBOARD_CROSS_FILTERS);
-
-export const emitFilterControl = enableCrossFilter
+export const emitFilterControl = isFeatureEnabled(
+  FeatureFlag.DASHBOARD_CROSS_FILTERS,
+)
   ? [
       {
         name: 'emit_filter',
diff --git a/superset-frontend/packages/superset-ui-chart-controls/src/shared-controls/legacySortBy.tsx b/superset-frontend/packages/superset-ui-chart-controls/src/shared-controls/index.ts
similarity index 64%
rename from superset-frontend/packages/superset-ui-chart-controls/src/shared-controls/legacySortBy.tsx
rename to superset-frontend/packages/superset-ui-chart-controls/src/shared-controls/index.ts
index 3cb882d29ece6..acf3f3e8fdd51 100644
--- a/superset-frontend/packages/superset-ui-chart-controls/src/shared-controls/legacySortBy.tsx
+++ b/superset-frontend/packages/superset-ui-chart-controls/src/shared-controls/index.ts
@@ -16,22 +16,10 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { t } from '@superset-ui/core';
-import { ControlSetRow } from '../types';
-
-export const legacySortBy: ControlSetRow[] = [
-  ['legacy_order_by'],
-  [
-    {
-      name: 'order_desc',
-      config: {
-        type: 'CheckboxControl',
-        label: t('Sort descending'),
-        default: true,
-        description: t(
-          'Whether to sort descending or ascending. Takes effect only when "Sort by" is set',
-        ),
-      },
-    },
-  ],
-];
+export { default as sharedControls } from './sharedControls';
+export { withDndFallback } from './dndControls';
+// React control components
+export { default as sharedControlComponents } from './components';
+export * from './components';
+export * from './customControls';
+export * from './mixins';
diff --git a/superset-frontend/packages/superset-ui-chart-controls/src/shared-controls/index.tsx b/superset-frontend/packages/superset-ui-chart-controls/src/shared-controls/sharedControls.tsx
similarity index 100%
rename from superset-frontend/packages/superset-ui-chart-controls/src/shared-controls/index.tsx
rename to superset-frontend/packages/superset-ui-chart-controls/src/shared-controls/sharedControls.tsx
diff --git a/superset-frontend/packages/superset-ui-chart-controls/src/types.ts b/superset-frontend/packages/superset-ui-chart-controls/src/types.ts
index c2ec315274d8a..60cda2ede8f49 100644
--- a/superset-frontend/packages/superset-ui-chart-controls/src/types.ts
+++ b/superset-frontend/packages/superset-ui-chart-controls/src/types.ts
@@ -30,8 +30,7 @@ import type {
   QueryFormMetric,
   QueryResponse,
 } from '@superset-ui/core';
-import sharedControls from './shared-controls';
-import sharedControlComponents from './shared-controls/components';
+import { sharedControls, sharedControlComponents } from './shared-controls';
 
 export type { Metric } from '@superset-ui/core';
 export type { ControlFormItemSpec } from './components/ControlForm';
diff --git a/superset-frontend/packages/superset-ui-chart-controls/src/utils/expandControlConfig.tsx b/superset-frontend/packages/superset-ui-chart-controls/src/utils/expandControlConfig.tsx
index 161dd5ad07aae..73b4133f990dc 100644
--- a/superset-frontend/packages/superset-ui-chart-controls/src/utils/expandControlConfig.tsx
+++ b/superset-frontend/packages/superset-ui-chart-controls/src/utils/expandControlConfig.tsx
@@ -17,8 +17,7 @@
  * under the License.
  */
 import React, { ReactElement } from 'react';
-import sharedControls from '../shared-controls';
-import sharedControlComponents from '../shared-controls/components';
+import { sharedControls, sharedControlComponents } from '../shared-controls';
 import {
   ControlType,
   ControlSetItem,