diff --git a/packages/grafana-ui/src/components/DataLinks/DataLinksInlineEditor/DataLinkEditorModalContent.tsx b/packages/grafana-ui/src/components/DataLinks/DataLinksInlineEditor/DataLinkEditorModalContent.tsx
index 48c2339e333..b6818c2716c 100644
--- a/packages/grafana-ui/src/components/DataLinks/DataLinksInlineEditor/DataLinkEditorModalContent.tsx
+++ b/packages/grafana-ui/src/components/DataLinks/DataLinksInlineEditor/DataLinkEditorModalContent.tsx
@@ -9,16 +9,16 @@ interface DataLinkEditorModalContentProps {
   index: number;
   data: DataFrame[];
   suggestions: VariableSuggestion[];
-  onChange: (index: number, ink: DataLink) => void;
-  onClose: () => void;
+  onSave: (index: number, ink: DataLink) => void;
+  onCancel: (index: number) => void;
 }
 
 export const DataLinkEditorModalContent: FC<DataLinkEditorModalContentProps> = ({
   link,
   index,
   suggestions,
-  onChange,
-  onClose,
+  onSave,
+  onCancel,
 }) => {
   const [dirtyLink, setDirtyLink] = useState(link);
   return (
@@ -35,13 +35,12 @@ export const DataLinkEditorModalContent: FC<DataLinkEditorModalContentProps> = (
       <HorizontalGroup>
         <Button
           onClick={() => {
-            onChange(index, dirtyLink);
-            onClose();
+            onSave(index, dirtyLink);
           }}
         >
           Save
         </Button>
-        <Button variant="secondary" onClick={() => onClose()}>
+        <Button variant="secondary" onClick={() => onCancel(index)}>
           Cancel
         </Button>
       </HorizontalGroup>
diff --git a/packages/grafana-ui/src/components/DataLinks/DataLinksInlineEditor/DataLinksInlineEditor.tsx b/packages/grafana-ui/src/components/DataLinks/DataLinksInlineEditor/DataLinksInlineEditor.tsx
index 9069b51430f..bad8b7a5d61 100644
--- a/packages/grafana-ui/src/components/DataLinks/DataLinksInlineEditor/DataLinksInlineEditor.tsx
+++ b/packages/grafana-ui/src/components/DataLinks/DataLinksInlineEditor/DataLinksInlineEditor.tsx
@@ -18,26 +18,40 @@ interface DataLinksInlineEditorProps {
 export const DataLinksInlineEditor: React.FC<DataLinksInlineEditorProps> = ({ links, onChange, suggestions, data }) => {
   const theme = useTheme();
   const [editIndex, setEditIndex] = useState<number | null>(null);
+  const [isNew, setIsNew] = useState(false);
+
   const styles = getDataLinksInlineEditorStyles(theme);
   const linksSafe: DataLink[] = links ?? [];
-  const isEditing = editIndex !== null && linksSafe[editIndex] !== undefined;
+  const isEditing = editIndex !== null;
 
   const onDataLinkChange = (index: number, link: DataLink) => {
+    if (isNew) {
+      if (link.title.trim() === '' && link.url.trim() === '') {
+        setIsNew(false);
+        setEditIndex(null);
+        return;
+      } else {
+        setEditIndex(null);
+        setIsNew(false);
+      }
+    }
     const update = cloneDeep(linksSafe);
     update[index] = link;
     onChange(update);
+    setEditIndex(null);
   };
 
   const onDataLinkAdd = () => {
     let update = cloneDeep(linksSafe);
+    setEditIndex(update.length);
+    setIsNew(true);
+  };
 
-    update.push({
-      title: '',
-      url: '',
-    });
-
-    setEditIndex(update.length - 1);
-    onChange(update);
+  const onDataLinkCancel = (index: number) => {
+    if (isNew) {
+      setIsNew(false);
+    }
+    setEditIndex(null);
   };
 
   const onDataLinkRemove = (index: number) => {
@@ -72,15 +86,15 @@ export const DataLinksInlineEditor: React.FC<DataLinksInlineEditorProps> = ({ li
           title="Edit link"
           isOpen={true}
           onDismiss={() => {
-            setEditIndex(null);
+            onDataLinkCancel(editIndex);
           }}
         >
           <DataLinkEditorModalContent
             index={editIndex}
-            link={linksSafe[editIndex]}
+            link={isNew ? { title: '', url: '' } : linksSafe[editIndex]}
             data={data}
-            onChange={onDataLinkChange}
-            onClose={() => setEditIndex(null)}
+            onSave={onDataLinkChange}
+            onCancel={onDataLinkCancel}
             suggestions={suggestions}
           />
         </Modal>