diff --git a/frontend/src/Components/Tooltip/Tooltip.js b/frontend/src/Components/Tooltip/Tooltip.js
index d841c7e7b..ea940c9d7 100644
--- a/frontend/src/Components/Tooltip/Tooltip.js
+++ b/frontend/src/Components/Tooltip/Tooltip.js
@@ -94,6 +94,8 @@ class Tooltip extends Component {
         <Portal>
           <Popper
             placement={position}
+            // Disable events to improve performance when many tooltips
+            // are shown (Quality Definitions for example).
             eventsEnabled={false}
             modifiers={{
               preventOverflow: {
@@ -103,7 +105,7 @@ class Tooltip extends Component {
               }
             }}
           >
-            {({ ref, style, scheduleUpdate }) => {
+            {({ ref, style, placement, scheduleUpdate }) => {
               this._scheduleUpdate = scheduleUpdate;
 
               return (
@@ -126,7 +128,7 @@ class Tooltip extends Component {
                           className={classNames(
                             styles.arrow,
                             styles[kind],
-                            styles[position]
+                            styles[placement.split('-')[0]]
                           )}
                         />