diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 23f1266c8..f928e052d 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1214,4 +1214,3 @@ Note the `y_axis_format` is defined under various section for some charts.
 | `viewport_latitude`             | _N/A_ |       |
 | `viewport_longitude`            | _N/A_ |       |
 | `viewport_zoom`                 | _N/A_ |       |
-| `whisker_options`               | _N/A_ |       |
diff --git a/superset-frontend/src/explore/controlPanels/BoxPlot.js b/superset-frontend/src/explore/controlPanels/BoxPlot.js
index 0f4cb16b2..6d76e4655 100644
--- a/superset-frontend/src/explore/controlPanels/BoxPlot.js
+++ b/superset-frontend/src/explore/controlPanels/BoxPlot.js
@@ -17,6 +17,7 @@
  * under the License.
  */
 import { t } from '@superset-ui/translation';
+import { formatSelectOptions } from '../../modules/utils';
 
 export default {
   controlPanelSections: [
@@ -30,7 +31,27 @@ export default {
       expanded: true,
       controlSetRows: [
         ['color_scheme', 'label_colors'],
-        ['whisker_options', 'x_ticks_layout'],
+        [
+          {
+            name: 'whisker_options',
+            config: {
+              type: 'SelectControl',
+              freeForm: true,
+              label: t('Whisker/outlier options'),
+              default: 'Tukey',
+              description: t(
+                'Determines how whiskers and outliers are calculated.',
+              ),
+              choices: formatSelectOptions([
+                'Tukey',
+                'Min/max (no outliers)',
+                '2/98 percentiles',
+                '9/91 percentiles',
+              ]),
+            },
+          },
+          'x_ticks_layout',
+        ],
       ],
     },
   ],
diff --git a/superset-frontend/src/explore/controls.jsx b/superset-frontend/src/explore/controls.jsx
index d895e3225..4deea5edd 100644
--- a/superset-frontend/src/explore/controls.jsx
+++ b/superset-frontend/src/explore/controls.jsx
@@ -889,20 +889,6 @@ export const controls = {
     choices: formatSelectOptions(['5', '10', '15', '25', '50', '75', '100']),
   },
 
-  whisker_options: {
-    type: 'SelectControl',
-    freeForm: true,
-    label: t('Whisker/outlier options'),
-    default: 'Tukey',
-    description: t('Determines how whiskers and outliers are calculated.'),
-    choices: formatSelectOptions([
-      'Tukey',
-      'Min/max (no outliers)',
-      '2/98 percentiles',
-      '9/91 percentiles',
-    ]),
-  },
-
   number_format: {
     type: 'SelectControl',
     freeForm: true,