diff --git a/PySimpleGUI.py b/PySimpleGUI.py
index c1ec3a2f..05e97abb 100644
--- a/PySimpleGUI.py
+++ b/PySimpleGUI.py
@@ -2029,7 +2029,7 @@ class Graph(Element):
         self.DragSubmits = drag_submits
         self.ClickPosition = (None, None)
         self.MouseButtonDown = False
-        self.Images = []
+        self.Images = {}
         self.RightClickMenu = right_click_menu
 
         super().__init__(ELEM_TYPE_GRAPH, background_color=background_color, size=canvas_size, pad=pad, key=key,
@@ -2184,9 +2184,9 @@ class Graph(Element):
             print('*** WARNING - The Graph element has not been finalized and cannot be drawn upon ***')
             print('Call Window.Finalize() prior to this operation')
             return None
-        self.Images.append(image)
         try:  # in case closed with X
             id = self._TKCanvas2.create_image(converted_point, image=image, anchor=tk.NW)
+            self.Images[id] = image
         except:
             id = None
         return id
@@ -2198,6 +2198,7 @@ class Graph(Element):
             print('*** WARNING - The Graph element has not been finalized and cannot be drawn upon ***')
             print('Call Window.Finalize() prior to this operation')
             return None
+        self.Images = {}
         try:            # in case window was closed with X
             self._TKCanvas2.delete('all')
         except:
@@ -2206,6 +2207,7 @@ class Graph(Element):
 
     def DeleteFigure(self, id):
         try:
+            del self.Images[id]
             self._TKCanvas2.delete(id)
         except:
             print('DeleteFigure - bad ID {}'.format(id))