diff --git a/public/app/features/query/components/QueryEditorRowHeader.tsx b/public/app/features/query/components/QueryEditorRowHeader.tsx
index 4122e04eebc..e41f9e33286 100644
--- a/public/app/features/query/components/QueryEditorRowHeader.tsx
+++ b/public/app/features/query/components/QueryEditorRowHeader.tsx
@@ -153,6 +153,7 @@ const getStyles = (theme: GrafanaTheme2) => {
       display: flex;
       align-items: center;
       margin-left: ${theme.spacing(0.5)};
+      overflow: hidden;
     `,
     queryNameWrapper: css`
       display: flex;
@@ -163,6 +164,7 @@ const getStyles = (theme: GrafanaTheme2) => {
       padding: 0 0 0 ${theme.spacing(0.5)};
       margin: 0;
       background: transparent;
+      overflow: hidden;
 
       &:hover {
         background: ${theme.colors.action.hover};
@@ -214,6 +216,7 @@ const getStyles = (theme: GrafanaTheme2) => {
       font-style: italic;
       color: ${theme.colors.text.secondary};
       padding-left: 10px;
+      padding-right: 10px;
     `,
     itemWrapper: css`
       display: flex;