diff --git a/frontend/src/metabase/components/TooltipPopover.jsx b/frontend/src/metabase/components/TooltipPopover.jsx
index dea1819337d85562aae54786f808214888df68fe..5bbf6c15ab6a31bbe3602e67ed8403ffafe687cc 100644
--- a/frontend/src/metabase/components/TooltipPopover.jsx
+++ b/frontend/src/metabase/components/TooltipPopover.jsx
@@ -13,7 +13,27 @@ const wordCount = (string) => string.split(' ').length;
 
 const TooltipPopover = ({ children, maxWidth, ...props }) => {
 
-    const needsSpace = wordCount(children) > CONDITIONAL_WORD_COUNT
+    let popoverContent;
+
+    if (typeof children === "string")  {
+        const needsSpace = wordCount(children) > CONDITIONAL_WORD_COUNT;
+        popoverContent = (
+            <div
+                className={cx(
+                    { 'py1 px2': !needsSpace },
+                    { 'py2 px3': needsSpace }
+                )}
+                style={{
+                    maxWidth: maxWidth || "12em",
+                    lineHeight: needsSpace ? 1.54 : 1
+                }}
+            >
+                {children}
+            </div>
+        );
+    } else {
+        popoverContent = children;
+    }
 
     return (
         <Popover
@@ -21,22 +41,7 @@ const TooltipPopover = ({ children, maxWidth, ...props }) => {
             targetOffsetY={10}
             {...props}
         >
-            { typeof children === "string" ?
-                <div
-                    className={cx(
-                        { 'py1 px2': !needsSpace },
-                        { 'py2 px3': needsSpace }
-                    )}
-                    style={{
-                        maxWidth: maxWidth || "12em",
-                        lineHeight: needsSpace ? 1.54 : 1
-                    }}
-                >
-                    {children}
-                </div>
-            :
-               children
-            }
+            {popoverContent}
         </Popover>
     )
 }