diff --git a/frontend/src/metabase/dashboard/components/DashCard.jsx b/frontend/src/metabase/dashboard/components/DashCard.jsx
index 42870bc12627e0fde2a04bed213aa3465d6e95b1..29ddb05eb9984bdd289cf70a3a017e4eebd36898 100644
--- a/frontend/src/metabase/dashboard/components/DashCard.jsx
+++ b/frontend/src/metabase/dashboard/components/DashCard.jsx
@@ -239,7 +239,7 @@ const ChartSettingsButton = ({ series, onReplaceAllVisualizationSettings }) => (
     triggerElement={
       <Icon name="gear" size={HEADER_ICON_SIZE} style={HEADER_ACTION_STYLE} />
     }
-    triggerClasses="text-light text-medium-hover cursor-pointer flex align-center flex-no-shrink mr1"
+    triggerClasses="text-light text-medium-hover cursor-pointer flex align-center flex-no-shrink mr1 drag-disabled"
   >
     <ChartSettingsWithState
       series={series}
@@ -251,7 +251,7 @@ const ChartSettingsButton = ({ series, onReplaceAllVisualizationSettings }) => (
 
 const RemoveButton = ({ onRemove }) => (
   <a
-    className="text-light text-medium-hover "
+    className="text-light text-medium-hover drag-disabled"
     data-metabase-event="Dashboard;Remove Card Modal"
     onClick={onRemove}
     style={HEADER_ACTION_STYLE}
@@ -263,7 +263,7 @@ const RemoveButton = ({ onRemove }) => (
 const AddSeriesButton = ({ series, onAddSeries }) => (
   <a
     data-metabase-event={"Dashboard;Edit Series Modal;open"}
-    className="text-light text-medium-hover cursor-pointer h3 flex-no-shrink relative mr1"
+    className="text-light text-medium-hover cursor-pointer h3 flex-no-shrink relative mr1 drag-disabled"
     onClick={onAddSeries}
     style={HEADER_ACTION_STYLE}
   >
diff --git a/frontend/src/metabase/dashboard/containers/DashCardCardParameterMapper.jsx b/frontend/src/metabase/dashboard/containers/DashCardCardParameterMapper.jsx
index f4c64872b0aa6e9b67761dd415316c8c0b4c4c39..a9c89c2393d66594ae703e0180fc8db52f47c553 100644
--- a/frontend/src/metabase/dashboard/containers/DashCardCardParameterMapper.jsx
+++ b/frontend/src/metabase/dashboard/containers/DashCardCardParameterMapper.jsx
@@ -146,10 +146,7 @@ export default class DashCardCardParameterMapper extends Component {
     }
 
     return (
-      <div
-        className="mx1 flex flex-column align-center"
-        onMouseDown={e => e.stopPropagation()}
-      >
+      <div className="mx1 flex flex-column align-center drag-disabled">
         {dashcard.series && dashcard.series.length > 0 && (
           <div
             className="h5 mb1 text-bold"
diff --git a/frontend/src/metabase/visualizations/visualizations/Text.jsx b/frontend/src/metabase/visualizations/visualizations/Text.jsx
index 61599a8677f106a458bf4b1a8d792d2072713841..8d38a0864899081f69454e94743084bd0c4707e9 100644
--- a/frontend/src/metabase/visualizations/visualizations/Text.jsx
+++ b/frontend/src/metabase/visualizations/visualizations/Text.jsx
@@ -211,10 +211,13 @@ const TextActionButtons = ({
       >
         <a
           data-metabase-event={"Dashboard;Text;edit"}
-          className={cx(" cursor-pointer h3 flex-no-shrink relative mr1", {
-            "text-light text-medium-hover": isShowingRenderedOutput,
-            "text-brand": !isShowingRenderedOutput,
-          })}
+          className={cx(
+            "cursor-pointer h3 flex-no-shrink relative mr1 drag-disabled",
+            {
+              "text-light text-medium-hover": isShowingRenderedOutput,
+              "text-brand": !isShowingRenderedOutput,
+            },
+          )}
           onClick={onEdit}
           style={HEADER_ACTION_STYLE}
         >
@@ -231,10 +234,13 @@ const TextActionButtons = ({
 
         <a
           data-metabase-event={"Dashboard;Text;preview"}
-          className={cx(" cursor-pointer h3 flex-no-shrink relative mr1", {
-            "text-light text-medium-hover": !isShowingRenderedOutput,
-            "text-brand": isShowingRenderedOutput,
-          })}
+          className={cx(
+            "cursor-pointer h3 flex-no-shrink relative mr1 drag-disabled",
+            {
+              "text-light text-medium-hover": !isShowingRenderedOutput,
+              "text-brand": isShowingRenderedOutput,
+            },
+          )}
           onClick={onPreview}
           style={HEADER_ACTION_STYLE}
         >