diff --git a/frontend/src/metabase/dashboard/containers/DashCardCardParameterMapper.jsx b/frontend/src/metabase/dashboard/containers/DashCardCardParameterMapper.jsx
index 3e4312213afaa1cfaab6fc58cc88d00d733f01bf..8379e218025f4712b207736c8f14a6e1f1f21025 100644
--- a/frontend/src/metabase/dashboard/containers/DashCardCardParameterMapper.jsx
+++ b/frontend/src/metabase/dashboard/containers/DashCardCardParameterMapper.jsx
@@ -111,6 +111,7 @@ export default class DashCardCardParameterMapper extends Component {
                 <PopoverWithTrigger
                     ref="popover"
                     triggerClasses={cx({ "disabled": disabled })}
+                    sizeToFit
                     triggerElement={
                         <Tooltip tooltip={tooltipText} verticalAttachments={["bottom", "top"]}>
                             {/* using div instead of button due to
diff --git a/frontend/src/metabase/query_builder/components/ActionsWidget.jsx b/frontend/src/metabase/query_builder/components/ActionsWidget.jsx
index 2edf5d135022c28760d50efbc64f05455a1a525d..a5534492c742a348873b1e523dbd402025be2c11 100644
--- a/frontend/src/metabase/query_builder/components/ActionsWidget.jsx
+++ b/frontend/src/metabase/query_builder/components/ActionsWidget.jsx
@@ -168,7 +168,9 @@ export default class ActionsWidget extends Component {
                                 width: POPOVER_WIDTH,
                                 bottom: "50%",
                                 right: "50%",
-                                zIndex: -1
+                                zIndex: -1,
+                                maxHeight: "600px",
+                                overflow: "scroll"
                             }}
                         >
                             {PopoverComponent