diff --git a/scm-ui-components/packages/ui-components/src/Tooltip.js b/scm-ui-components/packages/ui-components/src/Tooltip.js
index d935b323c7..50aecfc80c 100644
--- a/scm-ui-components/packages/ui-components/src/Tooltip.js
+++ b/scm-ui-components/packages/ui-components/src/Tooltip.js
@@ -5,20 +5,26 @@ import classNames from "classnames";
 type Props = {
   message: string,
   className: string,
+  location?: string,
   children: React.Node
 };
 
 class Tooltip extends React.Component<Props> {
+
+  static defaultProps = {
+    location: "right"
+  };
+
   render() {
-    const { className, message, children } = this.props;
+    const { className, message, location, children } = this.props;
     const multiline = message.length > 60 ? "is-tooltip-multiline" : "";
     return (
-      <div
-        className={classNames("tooltip", "is-tooltip-right", multiline, className)}
+      <span
+        className={classNames("tooltip", "is-tooltip-" + location, multiline, className)}
         data-tooltip={message}
       >
         {children}
-      </div>
+      </span>
     );
   }
 }