diff --git a/packages/grafana-ui/src/components/DataLinks/DataLinkInput.tsx b/packages/grafana-ui/src/components/DataLinks/DataLinkInput.tsx
index 82d4a6892cc..3e8d306b007 100644
--- a/packages/grafana-ui/src/components/DataLinks/DataLinkInput.tsx
+++ b/packages/grafana-ui/src/components/DataLinks/DataLinkInput.tsx
@@ -124,7 +124,6 @@ export const DataLinkInput: React.FC<DataLinkInputProps> = memo(
           'gf-form-input',
           css`
             position: relative;
-            height: auto;
           `
         )}
       >
diff --git a/public/app/plugins/datasource/loki/configuration/DerivedField.tsx b/public/app/plugins/datasource/loki/configuration/DerivedField.tsx
index 6a173efb5e2..9498e80eb86 100644
--- a/public/app/plugins/datasource/loki/configuration/DerivedField.tsx
+++ b/public/app/plugins/datasource/loki/configuration/DerivedField.tsx
@@ -6,6 +6,7 @@ import { DerivedFieldConfig } from '../types';
 const getStyles = stylesFactory(() => ({
   firstRow: css`
     display: flex;
+    align-items: baseline;
   `,
   nameField: css`
     flex: 2;
@@ -65,6 +66,9 @@ export const DerivedField = (props: Props) => {
             event.preventDefault();
             onDelete();
           }}
+          className={css`
+            margin-left: 8px;
+          `}
         />
       </div>