diff --git a/superset-frontend/spec/javascripts/views/CRUD/annotation/AnnotationModal_spec.jsx b/superset-frontend/spec/javascripts/views/CRUD/annotation/AnnotationModal_spec.jsx
new file mode 100644
index 000000000..1babcfe42
--- /dev/null
+++ b/superset-frontend/spec/javascripts/views/CRUD/annotation/AnnotationModal_spec.jsx
@@ -0,0 +1,97 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+import React from 'react';
+import thunk from 'redux-thunk';
+import configureStore from 'redux-mock-store';
+import fetchMock from 'fetch-mock';
+import AnnotationModal from 'src/views/CRUD/annotation/AnnotationModal';
+import Modal from 'src/common/components/Modal';
+import waitForComponentToPaint from 'spec/helpers/waitForComponentToPaint';
+import { JsonEditor } from 'src/components/AsyncAceEditor';
+import { styledMount as mount } from 'spec/helpers/theming';
+
+const mockData = {
+  id: 1,
+  short_descr: 'annotation 1',
+  start_dttm: '2019-07-01T10:25:00',
+  end_dttm: '2019-06-11T10:25:00',
+};
+
+const FETCH_ANNOTATION_ENDPOINT =
+  'glob:*/api/v1/annotation_layer/*/annotation/*';
+const ANNOTATION_PAYLOAD = { result: mockData };
+
+fetchMock.get(FETCH_ANNOTATION_ENDPOINT, ANNOTATION_PAYLOAD);
+
+const mockStore = configureStore([thunk]);
+const store = mockStore({});
+
+const mockedProps = {
+  addDangerToast: () => {},
+  annotation: mockData,
+  onAnnotationAdd: jest.fn(() => []),
+  onHide: () => {},
+  show: true,
+};
+
+async function mountAndWait(props = mockedProps) {
+  const mounted = mount(<AnnotationModal show {...props} />, {
+    context: { store },
+  });
+  await waitForComponentToPaint(mounted);
+
+  return mounted;
+}
+
+describe('AnnotationModal', () => {
+  let wrapper;
+
+  beforeAll(async () => {
+    wrapper = await mountAndWait();
+  });
+
+  it('renders', () => {
+    expect(wrapper.find(AnnotationModal)).toExist();
+  });
+
+  it('renders a Modal', () => {
+    expect(wrapper.find(Modal)).toExist();
+  });
+
+  it('renders add header when no annotation prop is included', async () => {
+    const addWrapper = await mountAndWait({});
+    expect(
+      addWrapper.find('[data-test="annotaion-modal-title"]').text(),
+    ).toEqual('Add Annotation');
+  });
+
+  it('renders edit header when annotation prop is included', () => {
+    expect(wrapper.find('[data-test="annotaion-modal-title"]').text()).toEqual(
+      'Edit Annotation',
+    );
+  });
+
+  it('renders input elements for annotation name', () => {
+    expect(wrapper.find('input[name="short_descr"]')).toExist();
+  });
+
+  it('renders json editor for json metadata', () => {
+    expect(wrapper.find(JsonEditor)).toExist();
+  });
+});
diff --git a/superset-frontend/src/common/components/DatePicker.tsx b/superset-frontend/src/common/components/DatePicker.tsx
new file mode 100644
index 000000000..f7aadc887
--- /dev/null
+++ b/superset-frontend/src/common/components/DatePicker.tsx
@@ -0,0 +1,22 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+import { DatePicker as AntdDatePicker } from 'src/common/components';
+
+export const { RangePicker } = AntdDatePicker;
+export const DatePicker = AntdDatePicker;
diff --git a/superset-frontend/src/common/components/index.tsx b/superset-frontend/src/common/components/index.tsx
index 5d73250d2..b6d61b60d 100644
--- a/superset-frontend/src/common/components/index.tsx
+++ b/superset-frontend/src/common/components/index.tsx
@@ -30,8 +30,9 @@ export {
   Avatar,
   Card,
   Collapse,
-  Empty,
+  DatePicker,
   Dropdown,
+  Empty,
   Modal,
   Popover,
   Skeleton,
diff --git a/superset-frontend/src/views/CRUD/annotation/AnnotationList.tsx b/superset-frontend/src/views/CRUD/annotation/AnnotationList.tsx
index 77c2467b9..e67e5ae3e 100644
--- a/superset-frontend/src/views/CRUD/annotation/AnnotationList.tsx
+++ b/superset-frontend/src/views/CRUD/annotation/AnnotationList.tsx
@@ -30,7 +30,7 @@ import { IconName } from 'src/components/Icon';
 import { useListViewResource } from 'src/views/CRUD/hooks';
 
 import { AnnotationObject } from './types';
-// import AnnotationModal from './AnnotationModal';
+import AnnotationModal from './AnnotationModal';
 
 const PAGE_SIZE = 25;
 
@@ -46,28 +46,27 @@ function AnnotationList({ addDangerToast }: AnnotationListProps) {
       resourceCount: annotationsCount,
       resourceCollection: annotations,
     },
-    // hasPerm,
     fetchData,
-    // refreshData,
+    refreshData,
   } = useListViewResource<AnnotationObject>(
     `annotation_layer/${annotationLayerId}/annotation`,
     t('annotation'),
     addDangerToast,
     false,
   );
-  // const [annotationModalOpen, setAnnotationModalOpen] = useState<boolean>(
-  //   false,
-  // );
+  const [annotationModalOpen, setAnnotationModalOpen] = useState<boolean>(
+    false,
+  );
   const [annotationLayerName, setAnnotationLayerName] = useState<string>('');
-  // const [
-  //   currentAnnotation,
-  //   setCurrentAnnotation,
-  // ] = useState<AnnotationObject | null>(null);
+  const [
+    currentAnnotation,
+    setCurrentAnnotation,
+  ] = useState<AnnotationObject | null>(null);
 
-  // function handleAnnotationEdit(annotation: AnnotationObject) {
-  //   setCurrentAnnotation(annotation);
-  //   setAnnotationModalOpen(true);
-  // }
+  const handleAnnotationEdit = (annotation: AnnotationObject) => {
+    setCurrentAnnotation(annotation);
+    setAnnotationModalOpen(true);
+  };
 
   const fetchAnnotationLayer = useCallback(
     async function fetchAnnotationLayer() {
@@ -120,8 +119,8 @@ function AnnotationList({ addDangerToast }: AnnotationListProps) {
         accessor: 'end_dttm',
       },
       {
-        Cell: () => {
-          const handleEdit = () => {}; // handleAnnotationEdit(original);
+        Cell: ({ row: { original } }: any) => {
+          const handleEdit = () => handleAnnotationEdit(original);
           const handleDelete = () => {}; // openDatabaseDeleteModal(original);
           const actions = [
             {
@@ -159,8 +158,8 @@ function AnnotationList({ addDangerToast }: AnnotationListProps) {
     ),
     buttonStyle: 'primary',
     onClick: () => {
-      // setCurrentAnnotation(null);
-      // setAnnotationModalOpen(true);
+      setCurrentAnnotation(null);
+      setAnnotationModalOpen(true);
     },
   });
 
@@ -170,14 +169,14 @@ function AnnotationList({ addDangerToast }: AnnotationListProps) {
         name={t(`Annotation Layer ${annotationLayerName}`)}
         buttons={subMenuButtons}
       />
-      {/* <AnnotationModal
+      <AnnotationModal
         addDangerToast={addDangerToast}
         annotation={currentAnnotation}
         show={annotationModalOpen}
         onAnnotationAdd={() => refreshData()}
         annnotationLayerId={annotationLayerId}
         onHide={() => setAnnotationModalOpen(false)}
-      /> */}
+      />
       <ListView<AnnotationObject>
         className="css-templates-list-view"
         columns={columns}
diff --git a/superset-frontend/src/views/CRUD/annotation/AnnotationModal.tsx b/superset-frontend/src/views/CRUD/annotation/AnnotationModal.tsx
new file mode 100644
index 000000000..ddd193188
--- /dev/null
+++ b/superset-frontend/src/views/CRUD/annotation/AnnotationModal.tsx
@@ -0,0 +1,336 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+import React, { FunctionComponent, useState, useEffect } from 'react';
+import { styled, t } from '@superset-ui/core';
+import { useSingleViewResource } from 'src/views/CRUD/hooks';
+import { RangePicker } from 'src/common/components/DatePicker';
+import moment from 'moment';
+import Icon from 'src/components/Icon';
+import Modal from 'src/common/components/Modal';
+import withToasts from 'src/messageToasts/enhancers/withToasts';
+import { JsonEditor } from 'src/components/AsyncAceEditor';
+
+import { AnnotationObject } from './types';
+
+interface AnnotationModalProps {
+  addDangerToast: (msg: string) => void;
+  annnotationLayerId: number;
+  annotation?: AnnotationObject | null;
+  onAnnotationAdd?: (annotation?: AnnotationObject) => void;
+  onHide: () => void;
+  show: boolean;
+}
+
+const StyledAnnotationTitle = styled.div`
+  margin: ${({ theme }) => theme.gridUnit * 2}px auto
+    ${({ theme }) => theme.gridUnit * 4}px auto;
+`;
+
+const StyledJsonEditor = styled(JsonEditor)`
+  border-radius: ${({ theme }) => theme.borderRadius}px;
+  border: 1px solid ${({ theme }) => theme.colors.secondary.light2};
+`;
+
+const StyledIcon = styled(Icon)`
+  margin: auto ${({ theme }) => theme.gridUnit * 2}px auto 0;
+`;
+
+const AnnotationContainer = styled.div`
+  margin-bottom: ${({ theme }) => theme.gridUnit * 5}px;
+
+  .control-label {
+    margin-bottom: ${({ theme }) => theme.gridUnit * 2}px;
+  }
+
+  .required {
+    margin-left: ${({ theme }) => theme.gridUnit / 2}px;
+    color: ${({ theme }) => theme.colors.error.base};
+  }
+
+  textarea {
+    flex: 1 1 auto;
+    height: ${({ theme }) => theme.gridUnit * 17}px;
+    resize: none;
+    width: 100%;
+  }
+
+  textarea,
+  input[type='text'] {
+    padding: ${({ theme }) => theme.gridUnit * 1.5}px
+      ${({ theme }) => theme.gridUnit * 2}px;
+    border: 1px solid ${({ theme }) => theme.colors.grayscale.light2};
+    border-radius: ${({ theme }) => theme.gridUnit}px;
+  }
+
+  input[type='text'] {
+    width: 65%;
+  }
+`;
+
+const AnnotationModal: FunctionComponent<AnnotationModalProps> = ({
+  addDangerToast,
+  annnotationLayerId,
+  annotation = null,
+  onAnnotationAdd,
+  onHide,
+  show,
+}) => {
+  const [disableSave, setDisableSave] = useState<boolean>(true);
+  const [
+    currentAnnotation,
+    setCurrentAnnotation,
+  ] = useState<AnnotationObject | null>(null);
+  const [isHidden, setIsHidden] = useState<boolean>(true);
+  const isEditMode = annotation !== null;
+
+  // annotation fetch logic
+  const {
+    state: { loading, resource },
+    fetchResource,
+    createResource,
+    updateResource,
+  } = useSingleViewResource<AnnotationObject>(
+    `annotation_layer/${annnotationLayerId}/annotation`,
+    t('annotation'),
+    addDangerToast,
+  );
+
+  // Functions
+  const hide = () => {
+    setIsHidden(true);
+    onHide();
+  };
+
+  const onSave = () => {
+    if (isEditMode) {
+      // Edit
+      if (currentAnnotation && currentAnnotation.id) {
+        const update_id = currentAnnotation.id;
+        delete currentAnnotation.id;
+        delete currentAnnotation.created_by;
+        delete currentAnnotation.changed_by;
+        delete currentAnnotation.changed_on_delta_humanized;
+        delete currentAnnotation.layer;
+        updateResource(update_id, currentAnnotation).then(() => {
+          if (onAnnotationAdd) {
+            onAnnotationAdd();
+          }
+
+          hide();
+        });
+      }
+    } else if (currentAnnotation) {
+      // Create
+      createResource(currentAnnotation).then(() => {
+        if (onAnnotationAdd) {
+          onAnnotationAdd();
+        }
+
+        hide();
+      });
+    }
+  };
+
+  const onAnnotationTextChange = (
+    event:
+      | React.ChangeEvent<HTMLInputElement>
+      | React.ChangeEvent<HTMLTextAreaElement>,
+  ) => {
+    const { target } = event;
+
+    const data = {
+      ...currentAnnotation,
+      end_dttm: currentAnnotation ? currentAnnotation.end_dttm : '',
+      short_descr: currentAnnotation ? currentAnnotation.short_descr : '',
+      start_dttm: currentAnnotation ? currentAnnotation.start_dttm : '',
+    };
+
+    data[target.name] = target.value;
+    setCurrentAnnotation(data);
+  };
+
+  const onJsonChange = (json: string) => {
+    const data = {
+      ...currentAnnotation,
+      end_dttm: currentAnnotation ? currentAnnotation.end_dttm : '',
+      json_metadata: json,
+      short_descr: currentAnnotation ? currentAnnotation.short_descr : '',
+      start_dttm: currentAnnotation ? currentAnnotation.start_dttm : '',
+    };
+    setCurrentAnnotation(data);
+  };
+
+  const onDateChange = (value: any, dateString: Array<string>) => {
+    const data = {
+      ...currentAnnotation,
+      end_dttm:
+        currentAnnotation && dateString[1].length
+          ? moment(dateString[1]).format('YYYY-MM-DD HH:mm')
+          : '',
+      short_descr: currentAnnotation ? currentAnnotation.short_descr : '',
+      start_dttm:
+        currentAnnotation && dateString[0].length
+          ? moment(dateString[0]).format('YYYY-MM-DD HH:mm')
+          : '',
+    };
+    setCurrentAnnotation(data);
+  };
+
+  const validate = () => {
+    if (
+      currentAnnotation &&
+      currentAnnotation.short_descr.length &&
+      currentAnnotation.start_dttm.length &&
+      currentAnnotation.end_dttm.length
+    ) {
+      setDisableSave(false);
+    } else {
+      setDisableSave(true);
+    }
+  };
+
+  // Initialize
+  if (
+    isEditMode &&
+    (!currentAnnotation ||
+      !currentAnnotation.id ||
+      (annotation && annotation.id !== currentAnnotation.id) ||
+      (isHidden && show))
+  ) {
+    if (annotation && annotation.id !== null && !loading) {
+      const id = annotation.id || 0;
+
+      fetchResource(id).then(() => {
+        setCurrentAnnotation(resource);
+      });
+    }
+  } else if (
+    !isEditMode &&
+    (!currentAnnotation || currentAnnotation.id || (isHidden && show))
+  ) {
+    setCurrentAnnotation({
+      short_descr: '',
+      start_dttm: '',
+      end_dttm: '',
+      json_metadata: '',
+      long_descr: '',
+    });
+  }
+
+  // Validation
+  useEffect(() => {
+    validate();
+  }, [
+    currentAnnotation ? currentAnnotation.short_descr : '',
+    currentAnnotation ? currentAnnotation.start_dttm : '',
+    currentAnnotation ? currentAnnotation.end_dttm : '',
+  ]);
+
+  // Show/hide
+  if (isHidden && show) {
+    setIsHidden(false);
+  }
+
+  return (
+    <Modal
+      disablePrimaryButton={disableSave}
+      onHandledPrimaryAction={onSave}
+      onHide={hide}
+      primaryButtonName={isEditMode ? t('Save') : t('Add')}
+      show={show}
+      width="55%"
+      title={
+        <h4 data-test="annotaion-modal-title">
+          {isEditMode ? (
+            <StyledIcon name="edit-alt" />
+          ) : (
+            <StyledIcon name="plus-large" />
+          )}
+          {isEditMode ? t('Edit Annotation') : t('Add Annotation')}
+        </h4>
+      }
+    >
+      <StyledAnnotationTitle>
+        <h4>{t('Basic Information')}</h4>
+      </StyledAnnotationTitle>
+      <AnnotationContainer>
+        <div className="control-label">
+          {t('annotation name')}
+          <span className="required">*</span>
+        </div>
+        <input
+          name="short_descr"
+          onChange={onAnnotationTextChange}
+          type="text"
+          value={currentAnnotation?.short_descr}
+        />
+      </AnnotationContainer>
+      <AnnotationContainer>
+        <div className="control-label">
+          {t('date')}
+          <span className="required">*</span>
+        </div>
+        <RangePicker
+          onChange={onDateChange}
+          showTime={{ format: 'hh:mm a' }}
+          format="YYYY-MM-DD hh:mm a"
+          use12Hours
+          // @ts-ignore
+          value={
+            currentAnnotation &&
+            (currentAnnotation?.start_dttm.length ||
+              currentAnnotation?.end_dttm.length)
+              ? [
+                  moment(currentAnnotation.start_dttm),
+                  moment(currentAnnotation.end_dttm),
+                ]
+              : null
+          }
+        />
+      </AnnotationContainer>
+      <StyledAnnotationTitle>
+        <h4>{t('Additional Information')}</h4>
+      </StyledAnnotationTitle>
+      <AnnotationContainer>
+        <div className="control-label">{t('description')}</div>
+        <textarea
+          name="long_descr"
+          value={currentAnnotation ? currentAnnotation.long_descr : ''}
+          placeholder={t('Description (this can be seen in the list)')}
+          onChange={onAnnotationTextChange}
+        />
+      </AnnotationContainer>
+      <AnnotationContainer>
+        <div className="control-label">{t('json metadata')}</div>
+        <StyledJsonEditor
+          onChange={onJsonChange}
+          value={
+            currentAnnotation && currentAnnotation.json_metadata
+              ? currentAnnotation.json_metadata
+              : ''
+          }
+          width="100%"
+          height="120px"
+        />
+      </AnnotationContainer>
+    </Modal>
+  );
+};
+
+export default withToasts(AnnotationModal);
diff --git a/superset-frontend/src/views/CRUD/annotation/types.ts b/superset-frontend/src/views/CRUD/annotation/types.ts
index 3c2ebc294..cc74b7cc6 100644
--- a/superset-frontend/src/views/CRUD/annotation/types.ts
+++ b/superset-frontend/src/views/CRUD/annotation/types.ts
@@ -26,11 +26,13 @@ export type AnnotationObject = {
   changed_by?: user;
   changed_on_delta_humanized?: string;
   created_by?: user;
-  end_dttm?: string;
+  end_dttm: string;
   id?: number;
   json_metadata?: string;
   long_descr?: string;
-  short_descr?: string;
-  start_dttm?: string;
-  label: string;
+  short_descr: string;
+  start_dttm: string;
+  layer?: {
+    id: number;
+  };
 };
diff --git a/superset-frontend/src/views/CRUD/hooks.ts b/superset-frontend/src/views/CRUD/hooks.ts
index 2373a540a..827e4a5fb 100644
--- a/superset-frontend/src/views/CRUD/hooks.ts
+++ b/superset-frontend/src/views/CRUD/hooks.ts
@@ -212,7 +212,7 @@ export function useSingleViewResource<D extends object = any>(
             t(
               'An error occurred while fetching %ss: %s',
               resourceLabel,
-              errMsg,
+              JSON.stringify(errMsg),
             ),
           ),
         ),
@@ -244,7 +244,7 @@ export function useSingleViewResource<D extends object = any>(
             t(
               'An error occurred while fetching %ss: %s',
               resourceLabel,
-              errMsg,
+              JSON.stringify(errMsg),
             ),
           ),
         ),
@@ -276,7 +276,7 @@ export function useSingleViewResource<D extends object = any>(
             t(
               'An error occurred while fetching %ss: %s',
               resourceLabel,
-              errMsg,
+              JSON.stringify(errMsg),
             ),
           ),
         ),
diff --git a/superset/annotation_layers/annotations/api.py b/superset/annotation_layers/annotations/api.py
index 34c625548..d7241b650 100644
--- a/superset/annotation_layers/annotations/api.py
+++ b/superset/annotation_layers/annotations/api.py
@@ -70,6 +70,7 @@ class AnnotationRestApi(BaseSupersetModelRestApi):
     allow_browser_login = True
 
     show_columns = [
+        "id",
         "short_descr",
         "long_descr",
         "start_dttm",
@@ -79,6 +80,7 @@ class AnnotationRestApi(BaseSupersetModelRestApi):
         "layer.name",
     ]
     list_columns = [
+        "id",
         "changed_by.first_name",
         "changed_by.id",
         "changed_on_delta_humanized",
diff --git a/tests/annotation_layers/api_tests.py b/tests/annotation_layers/api_tests.py
index dd3be4b37..2b0df4126 100644
--- a/tests/annotation_layers/api_tests.py
+++ b/tests/annotation_layers/api_tests.py
@@ -435,6 +435,7 @@ class TestAnnotationLayerApi(SupersetTestCase):
         assert rv.status_code == 200
 
         expected_result = {
+            "id": annotation.id,
             "end_dttm": None,
             "json_metadata": "",
             "layer": {"id": annotation.layer_id, "name": "layer_with_annotations"},