diff --git a/src/components/tooltip/index.js b/src/components/tooltip/index.js
index ddf97782a..10ecc3799 100644
--- a/src/components/tooltip/index.js
+++ b/src/components/tooltip/index.js
@@ -40,7 +40,7 @@ class Tooltip extends PureComponent {
 
     render() {
         const {label, className, htmlFor, ...others} = this.props;
-        const renderedClassName = `${className ? className : ''}${this.buildClassname()}`;
+        const renderedClassName = `${className ? (' ' + className) : ''}${this.buildClassname()}`;
         const tooltipProps = { ...filterProps(others), htmlFor, className: renderedClassName};        
 
         return (