diff --git a/public/app/features/query/components/QueryGroup.tsx b/public/app/features/query/components/QueryGroup.tsx
index 5615d24cf10..1baded560c3 100644
--- a/public/app/features/query/components/QueryGroup.tsx
+++ b/public/app/features/query/components/QueryGroup.tsx
@@ -316,14 +316,15 @@ export class QueryGroup extends PureComponent<Props, State> {
         )}
         {isAddingMixed && this.renderMixedPicker()}
         {this.isExpressionsSupported(dsSettings) && (
-          <Tooltip content="Experimental feature, queries might break in next version">
+          <Tooltip content="Experimental feature: queries could stop working in next version" placement="right">
             <Button
               icon="plus"
               onClick={this.onAddExpressionClick}
               variant="secondary"
               className={styles.expressionButton}
             >
-              Expression <Icon name="exclamation-triangle" className="muted" size="sm" />
+              <span>Expression&nbsp;</span>
+              <Icon name="exclamation-triangle" className="muted" size="sm" />
             </Button>
           </Tooltip>
         )}