diff --git a/src/components/ContextMenuPopover/index.js b/src/components/ContextMenuPopover/index.js
index 56bfefc147ac..03d325b0e67e 100644
--- a/src/components/ContextMenuPopover/index.js
+++ b/src/components/ContextMenuPopover/index.js
@@ -17,6 +17,7 @@ const ContextMenuPopover = props => (!props.isSmallScreenWidth ? createPortal(
     <Popover
         // eslint-disable-next-line react/jsx-props-no-spreading
         {...props}
+        type={CONST.MODAL.MODAL_TYPE.BOTTOM_DOCKED}
     />
 ));
 
diff --git a/src/components/ContextMenuPopover/index.native.js b/src/components/ContextMenuPopover/index.native.js
index 9e9a9e3fa537..6d278e9e321a 100644
--- a/src/components/ContextMenuPopover/index.native.js
+++ b/src/components/ContextMenuPopover/index.native.js
@@ -2,6 +2,7 @@ import React from 'react';
 import {propTypes, defaultProps} from '../Popover/PopoverPropTypes';
 import withWindowDimensions from '../withWindowDimensions';
 import Popover from '../Popover';
+import CONST from '../../CONST';
 
 /*
  * This is a convenience wrapper around the Modal component for a responsive Popover.
@@ -11,6 +12,7 @@ const ContextMenuPopover = props => (
     <Popover
         // eslint-disable-next-line react/jsx-props-no-spreading
         {...props}
+        type={CONST.MODAL.MODAL_TYPE.BOTTOM_DOCKED}
     />
 );
 
diff --git a/src/components/Popover/PopoverPropTypes.js b/src/components/Popover/PopoverPropTypes.js
index 7d87de319da9..e6f9c6856cfe 100644
--- a/src/components/Popover/PopoverPropTypes.js
+++ b/src/components/Popover/PopoverPropTypes.js
@@ -1,7 +1,6 @@
 import _ from 'underscore';
 import PropTypes from 'prop-types';
 import {propTypes as modalPropTypes, defaultProps as defaultModalProps} from '../Modal/ModalPropTypes';
-import CONST from '../../CONST';
 
 const propTypes = {
     ...(_.omit(modalPropTypes, 'popoverAnchorPosition')),
@@ -20,7 +19,6 @@ const defaultProps = {
 
     // Anchor position is optional only because it is not relevant on mobile
     anchorPosition: {},
-    type: CONST.MODAL.MODAL_TYPE.POPOVER,
 };
 
 export {propTypes, defaultProps};
diff --git a/src/components/Popover/index.js b/src/components/Popover/index.js
index c558823a9b92..9879d1d79a5f 100644
--- a/src/components/Popover/index.js
+++ b/src/components/Popover/index.js
@@ -10,7 +10,7 @@ import withWindowDimensions from '../withWindowDimensions';
  */
 const Popover = props => (
     <Modal
-        type={props.isSmallScreenWidth ? CONST.MODAL.MODAL_TYPE.BOTTOM_DOCKED : props.type}
+        type={props.isSmallScreenWidth ? CONST.MODAL.MODAL_TYPE.BOTTOM_DOCKED : CONST.MODAL.MODAL_TYPE.POPOVER}
         popoverAnchorPosition={props.anchorPosition}
         // eslint-disable-next-line react/jsx-props-no-spreading
         {...props}