diff --git a/api-editor/gui/src/features/annotations/batchforms/AnnotationBatchForm.tsx b/api-editor/gui/src/features/annotations/batchforms/AnnotationBatchForm.tsx
index c4c1adda6..d2048d889 100644
--- a/api-editor/gui/src/features/annotations/batchforms/AnnotationBatchForm.tsx
+++ b/api-editor/gui/src/features/annotations/batchforms/AnnotationBatchForm.tsx
@@ -1,11 +1,12 @@
-import { Button, Heading, HStack, Stack, Text as ChakraText } from '@chakra-ui/react';
+import { Button, Heading, HStack, Stack, Text as ChakraText, Tooltip } from '@chakra-ui/react';
 import React from 'react';
+import { useKeyboardShortcut } from '../../../app/hooks';
 
 interface AnnotationFormProps {
     heading: string;
     description: string;
-    onConfirm: React.MouseEventHandler<HTMLButtonElement>;
-    onCancel: React.MouseEventHandler<HTMLButtonElement>;
+    onConfirm: () => void;
+    onCancel: () => void;
     children: React.ReactNode;
 }
 
@@ -16,6 +17,9 @@ export const AnnotationBatchForm: React.FC<AnnotationFormProps> = function ({
     onConfirm,
     children,
 }) {
+    useKeyboardShortcut(false, true, false, 'Enter', onConfirm);
+    useKeyboardShortcut(false, false, false, 'Escape', onCancel);
+
     return (
         <Stack spacing={8} p={4}>
             <Stack spacing={4}>
@@ -29,12 +33,16 @@ export const AnnotationBatchForm: React.FC<AnnotationFormProps> = function ({
             <Stack spacing={4}>{children}</Stack>
 
             <HStack>
-                <Button colorScheme="blue" onClick={onConfirm}>
-                    Confirm
-                </Button>
-                <Button colorScheme="red" onClick={onCancel}>
-                    Cancel
-                </Button>
+                <Tooltip label="Preview the elements changed by this batch operation. (Ctrl+Enter)">
+                    <Button colorScheme="blue" onClick={onConfirm}>
+                        Start Dry Run
+                    </Button>
+                </Tooltip>
+                <Tooltip label="Stop the batch operation. (Esc)">
+                    <Button colorScheme="red" onClick={onCancel}>
+                        Cancel
+                    </Button>
+                </Tooltip>
             </HStack>
         </Stack>
     );
diff --git a/api-editor/gui/src/features/annotations/forms/AnnotationForm.tsx b/api-editor/gui/src/features/annotations/forms/AnnotationForm.tsx
index 9c690c559..8880e66c2 100644
--- a/api-editor/gui/src/features/annotations/forms/AnnotationForm.tsx
+++ b/api-editor/gui/src/features/annotations/forms/AnnotationForm.tsx
@@ -1,11 +1,12 @@
-import { Button, Heading, HStack, Stack, Text as ChakraText } from '@chakra-ui/react';
+import { Button, Heading, HStack, Stack, Text as ChakraText, Tooltip } from '@chakra-ui/react';
 import React from 'react';
+import { useKeyboardShortcut } from '../../../app/hooks';
 
 interface AnnotationFormProps {
     heading: string;
     description: string;
-    onSave: React.MouseEventHandler<HTMLButtonElement>;
-    onCancel: React.MouseEventHandler<HTMLButtonElement>;
+    onSave: () => void;
+    onCancel: () => void;
     children: React.ReactNode;
 }
 
@@ -16,6 +17,9 @@ export const AnnotationForm: React.FC<AnnotationFormProps> = function ({
     onSave,
     children,
 }) {
+    useKeyboardShortcut(false, true, false, 'Enter', onSave);
+    useKeyboardShortcut(false, false, false, 'Escape', onCancel);
+
     return (
         <Stack spacing={8} p={4}>
             <Stack spacing={4}>
@@ -29,12 +33,16 @@ export const AnnotationForm: React.FC<AnnotationFormProps> = function ({
             <Stack spacing={4}>{children}</Stack>
 
             <HStack>
-                <Button colorScheme="blue" onClick={onSave}>
-                    Save
-                </Button>
-                <Button colorScheme="red" onClick={onCancel}>
-                    Cancel
-                </Button>
+                <Tooltip label="Confirm the change. (Ctrl+Enter)">
+                    <Button colorScheme="blue" onClick={onSave}>
+                        Save
+                    </Button>
+                </Tooltip>
+                <Tooltip label="Drop the change. (Esc)">
+                    <Button colorScheme="red" onClick={onCancel}>
+                        Cancel
+                    </Button>
+                </Tooltip>
             </HStack>
         </Stack>
     );