diff --git a/src/components/Tooltip/TooltipRenderedOnPageBody.js b/src/components/Tooltip/TooltipRenderedOnPageBody.js
index 66ba3a57cd44..562842260f6c 100644
--- a/src/components/Tooltip/TooltipRenderedOnPageBody.js
+++ b/src/components/Tooltip/TooltipRenderedOnPageBody.js
@@ -95,12 +95,12 @@ class TooltipRenderedOnPageBody extends React.PureComponent {
             this.props.yOffset,
             this.props.wrapperWidth,
             this.props.wrapperHeight,
+            this.props.maxWidth,
             this.state.tooltipWidth,
             this.state.tooltipHeight,
             this.state.tooltipTextWidth,
             this.props.shiftHorizontal,
             this.props.shiftVertical,
-            this.props.maxWidth,
         );
         return ReactDOM.createPortal(
             <Animated.View
diff --git a/src/styles/getTooltipStyles.js b/src/styles/getTooltipStyles.js
index 013181f0367b..e2f53956392b 100644
--- a/src/styles/getTooltipStyles.js
+++ b/src/styles/getTooltipStyles.js
@@ -60,6 +60,7 @@ function computeHorizontalShift(windowWidth, xOffset, componentWidth, tooltipWid
  *                           and the top edge of the wrapped component.
  * @param {Number} componentWidth - The width of the wrapped component.
  * @param {Number} componentHeight - The height of the wrapped component.
+ * @param {Number} maxWidth - The tooltip's max width.
  * @param {Number} tooltipWidth - The width of the tooltip itself.
  * @param {Number} tooltipHeight - The height of the tooltip itself.
  * @param {Number} tooltipTextWidth - The tooltip's inner text width.
@@ -68,7 +69,6 @@ function computeHorizontalShift(windowWidth, xOffset, componentWidth, tooltipWid
  *                                         and a negative value shifts it to the left.
  * @param {Number} [manualShiftVertical] - Any additional amount to manually shift the tooltip up or down.
  *                                       A positive value shifts it down, and a negative value shifts it up.
- * @param {Number} maxWidth - The tooltip's max width.
  * @returns {Object}
  */
 export default function getTooltipStyles(
@@ -78,12 +78,12 @@ export default function getTooltipStyles(
     yOffset,
     componentWidth,
     componentHeight,
+    maxWidth,
     tooltipWidth,
     tooltipHeight,
     tooltipTextWidth,
     manualShiftHorizontal = 0,
     manualShiftVertical = 0,
-    maxWidth,
 ) {
     // Determine if the tooltip should display below the wrapped component.
     // If a tooltip will try to render within GUTTER_WIDTH logical pixels of the top of the screen,
@@ -105,7 +105,6 @@ export default function getTooltipStyles(
         // TooltipTextWidth ignores the fractions (OffsetWidth) so add 1px to fit the text properly.
         ? tooltipTextWidth + (spacing.ph2.paddingHorizontal * 2) + 1
         : maxWidth;
-
     return {
         animationStyle: {
             // remember Transform causes a new Local cordinate system