diff --git a/eslint-suppressions.json b/eslint-suppressions.json
index 492d5e18958..f90a21cb7c5 100644
--- a/eslint-suppressions.json
+++ b/eslint-suppressions.json
@@ -4105,11 +4105,6 @@
       "count": 10
     }
   },
-  "public/app/plugins/datasource/opentsdb/components/AnnotationEditor.tsx": {
-    "no-restricted-syntax": {
-      "count": 3
-    }
-  },
   "public/app/plugins/datasource/opentsdb/components/OpenTsdbDetails.tsx": {
     "no-restricted-syntax": {
       "count": 3
@@ -4682,4 +4677,4 @@
       "count": 1
     }
   }
-}
\ No newline at end of file
+}
diff --git a/public/app/plugins/datasource/opentsdb/components/AnnotationEditor.tsx b/public/app/plugins/datasource/opentsdb/components/AnnotationEditor.tsx
index d6fbfd8b8c4..e3e579185db 100644
--- a/public/app/plugins/datasource/opentsdb/components/AnnotationEditor.tsx
+++ b/public/app/plugins/datasource/opentsdb/components/AnnotationEditor.tsx
@@ -1,7 +1,7 @@
 import { useState } from 'react';
 
 import { QueryEditorProps } from '@grafana/data';
-import { InlineFormLabel, Input, InlineSwitch } from '@grafana/ui';
+import { InlineFormLabel, Input, InlineSwitch, Stack } from '@grafana/ui';
 
 import OpenTsDatasource from '../datasource';
 import { OpenTsdbQuery, OpenTsdbOptions } from '../types';
@@ -26,8 +26,8 @@ export const AnnotationEditor = (props: QueryEditorProps<OpenTsDatasource, OpenT
   };
 
   return (
-    <div className="gf-form-group">
-      <div className="gf-form">
+    <Stack gap={1} direction="column">
+      <Stack gap={0}>
         <InlineFormLabel width={12}>OpenTSDB metrics query</InlineFormLabel>
         <Input
           value={target}
@@ -35,11 +35,11 @@ export const AnnotationEditor = (props: QueryEditorProps<OpenTsDatasource, OpenT
           onBlur={() => updateValue('target', target)}
           placeholder="events.eventname"
         />
-      </div>
-      <div className="gf-form">
+      </Stack>
+      <Stack gap={0}>
         <InlineFormLabel width={12}>Show Global Annotations?</InlineFormLabel>
         <InlineSwitch value={isGlobal} onChange={(e) => updateIsGlobal(isGlobal)} />
-      </div>
-    </div>
+      </Stack>
+    </Stack>
   );
 };